diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-03-15 15:22:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-03-15 15:22:06 +0000 |
| commit | 3fa31714b95c1b8ba7019647a874e2800819b6ae (patch) | |
| tree | 9e70bcec654f061d5ee14420bde367f1008d3064 | |
| parent | 07532dca7f40b2e81df67eadb84f9f18c8be1ef1 (diff) | |
| download | upstream-3fa31714b95c1b8ba7019647a874e2800819b6ae.tar.gz upstream-3fa31714b95c1b8ba7019647a874e2800819b6ae.tar.bz2 upstream-3fa31714b95c1b8ba7019647a874e2800819b6ae.zip | |
ath9k: add a fix to reduce the number of spurious tx hang detections
SVN-Revision: 36040
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index e711ccf0b5..3d4e85ddd7 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -859,3 +859,40 @@ /* Test value. if 0 then attenuation is unused. Don't load anything. */ for (i = 0; i < 3; i++) { if (ah->txchainmask & BIT(i)) { +--- a/drivers/net/wireless/ath/ath9k/link.c ++++ b/drivers/net/wireless/ath/ath9k/link.c +@@ -28,21 +28,21 @@ void ath_tx_complete_poll_work(struct wo + int i; + bool needreset = false; + +- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) +- if (ATH_TXQ_SETUP(sc, i)) { +- txq = &sc->tx.txq[i]; +- ath_txq_lock(sc, txq); +- if (txq->axq_depth) { +- if (txq->axq_tx_inprogress) { +- needreset = true; +- ath_txq_unlock(sc, txq); +- break; +- } else { +- txq->axq_tx_inprogress = true; +- } ++ for (i = 0; i < IEEE80211_NUM_ACS; i++) { ++ txq = sc->tx.txq_map[i]; ++ ++ ath_txq_lock(sc, txq); ++ if (txq->axq_depth) { ++ if (txq->axq_tx_inprogress) { ++ needreset = true; ++ ath_txq_unlock(sc, txq); ++ break; ++ } else { ++ txq->axq_tx_inprogress = true; + } +- ath_txq_unlock_complete(sc, txq); + } ++ ath_txq_unlock_complete(sc, txq); ++ } + + if (needreset) { + ath_dbg(ath9k_hw_common(sc->sc_ah), RESET, |