Commit d67df2b9 authored by John W. Linville's avatar John W. Linville

Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents c1e37ea2 009b9696
...@@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/ ...@@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/
obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_P54_COMMON) += p54/
obj-$(CONFIG_ATH_COMMON) += ath/ obj-$(CONFIG_ATH_CARDS) += ath/
obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o
......
...@@ -685,6 +685,14 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp) ...@@ -685,6 +685,14 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
* to mac80211. * to mac80211.
*/ */
rx_status = IEEE80211_SKB_RXCB(entry->skb); rx_status = IEEE80211_SKB_RXCB(entry->skb);
/* Ensure that all fields of rx_status are initialized
* properly. The skb->cb array was used for driver
* specific informations, so rx_status might contain
* garbage.
*/
memset(rx_status, 0, sizeof(*rx_status));
rx_status->mactime = rxdesc.timestamp; rx_status->mactime = rxdesc.timestamp;
rx_status->band = rt2x00dev->curr_band; rx_status->band = rt2x00dev->curr_band;
rx_status->freq = rt2x00dev->curr_freq; rx_status->freq = rt2x00dev->curr_freq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment