Dave,
Please pull these fixes for the 3.8 stream.
Gabor Juhos provides and rt2x00 fix to properly clear-out the skb->cb
for reporting tx_status. Recent changes made this necessary where it
previously was not.
Vladimir Kondratiev gives us a fix for a build issue that caused some
ath9k devices to be skipped in the build based on unrelated config
choices.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit c1e37ea287979052e3eab441e58da3899a8e2389:
net: fec: forbid FEC_PTP on SoCs that do not support (2012-12-18 16:26:18 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to d67df2b9edfc42ccc0a9ee5332e2821d487d6b3b:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2012-12-19 13:00:00 -0500)
----------------------------------------------------------------
Gabor Juhos (1):
rt2x00: zero-out rx_status
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Vladimir Kondratiev (1):
wireless: fix Atheros drivers compilation
drivers/net/wireless/Makefile | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 062dfdf..67156ef 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -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
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 4ffb6a5..44f8b3f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -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;
--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
Attachment:
pgpi5bfYQd46f.pgp
Description: PGP signature
