summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-03 01:08:53 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-03 01:08:53 +0000
commitb776a26947c7bf0b4f631c743c54a51fb4167519 (patch)
treed72b0bdaa038a84ec54d1147101b90742c6c7249
parent75ace030b995e2e4056aba6f5602fabf13c700d7 (diff)
ath5k: fix tx queue limit for the cabq, fixes warning described in #9465
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27367 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/447-ath5k_fix_queue_stop_warning.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/package/mac80211/patches/447-ath5k_fix_queue_stop_warning.patch b/package/mac80211/patches/447-ath5k_fix_queue_stop_warning.patch
new file mode 100644
index 000000000..ade0eeff8
--- /dev/null
+++ b/package/mac80211/patches/447-ath5k_fix_queue_stop_warning.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1555,7 +1555,8 @@ ath5k_tx_queue(struct ieee80211_hw *hw,
+ goto drop_packet;
+ }
+
+- if (txq->txq_len >= txq->txq_max)
++ if (txq->txq_len >= txq->txq_max &&
++ txq->qnum <= AR5K_TX_QUEUE_ID_DATA_MAX)
+ ieee80211_stop_queue(hw, txq->qnum);
+
+ spin_lock_irqsave(&sc->txbuflock, flags);
+@@ -1931,6 +1932,10 @@ ath5k_beacon_send(struct ath5k_softc *sc
+ skb = ieee80211_get_buffered_bc(sc->hw, vif);
+ while (skb) {
+ ath5k_tx_queue(sc->hw, skb, sc->cabq);
++
++ if (sc->cabq->txq_len >= sc->cabq->txq_max)
++ break;
++
+ skb = ieee80211_get_buffered_bc(sc->hw, vif);
+ }
+