summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-03-03 19:23:36 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-03-05 14:39:47 -0500
commitee166a0e71947e0ebeb044fd2277435f665270ac (patch)
tree13726f5488e700fe5606d67d566ff442cf55e59e
parent18eb62f87a8d1dc6ed8a01a52e6b2b1600802608 (diff)
downloadlinux-stable-ee166a0e71947e0ebeb044fd2277435f665270ac.tar.gz
linux-stable-ee166a0e71947e0ebeb044fd2277435f665270ac.tar.bz2
linux-stable-ee166a0e71947e0ebeb044fd2277435f665270ac.zip
ath9k: Check virtual wiphy state on tx()
mac80211 should not be requesting us to transmit frames on paused wiphys since we stop the TX queues. Just in case, add debug code to make sure we catch if this were to happen. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath9k/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 9b5f21493650..6d19a31934d5 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -2077,6 +2077,12 @@ static int ath9k_tx(struct ieee80211_hw *hw,
struct ath_tx_control txctl;
int hdrlen, padsize;
+ if (aphy->state != ATH_WIPHY_ACTIVE) {
+ printk(KERN_DEBUG "ath9k: %s: TX in unexpected wiphy state "
+ "%d\n", wiphy_name(hw->wiphy), aphy->state);
+ goto exit;
+ }
+
memset(&txctl, 0, sizeof(struct ath_tx_control));
/*