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

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

drivers/net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/ 


obj-$(CONFIG_P54_COMMON)	+= p54/



obj-$(CONFIG_ATH_COMMON)	+= ath/

obj-$(CONFIG_ATH_CARDS)		+= ath/



obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o

drivers/net/wireless/rt2x00/rt2x00dev.c

+8 −0
Original line number Diff line number Diff line
@@ -685,6 +685,14 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp) 
	 * to mac80211.

	 */

	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->band = rt2x00dev->curr_band;

	rx_status->freq = rt2x00dev->curr_freq;