summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/init.c
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2011-01-09 23:11:52 -0800
committerJohn W. Linville <linville@tuxdriver.com>2011-01-21 15:34:17 -0500
commit60f2d1d506195803fa6e1dcf3972637b740fdd60 (patch)
tree583cf2f90cfe193f502c6ad8f4ab0e5135611325 /drivers/net/wireless/ath/ath9k/init.c
parent71e025a5a630681ad8b37d4426a994d199976ec9 (diff)
downloadop-kernel-dev-60f2d1d506195803fa6e1dcf3972637b740fdd60.zip
op-kernel-dev-60f2d1d506195803fa6e1dcf3972637b740fdd60.tar.gz
ath9k: Restart xmit logic in xmit watchdog.
The system can get into a state where the xmit queue is stopped, but there are no packets pending, so the queue will not be restarted. Add logic to the xmit watchdog to attempt to restart the xmit logic if this situation is detected. Example 'dmesg' output: ath: txq: f4e723e0 axq_qnum: 2, mac80211_qnum: 2 axq_link: f4e996c8 pending frames: 1 axq_acq empty: 1 stopped: 0 axq_depth: 0 Attempting to restart tx logic. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 59c01ca..5279653c 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -442,9 +442,10 @@ static int ath9k_init_queues(struct ath_softc *sc)
sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
ath_cabq_update(sc);
- for (i = 0; i < WME_NUM_AC; i++)
+ for (i = 0; i < WME_NUM_AC; i++) {
sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);
-
+ sc->tx.txq_map[i]->mac80211_qnum = i;
+ }
return 0;
}
OpenPOWER on IntegriCloud