aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-03 01:08:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-03 01:08:53 +0000
commit0fa08e885c4b83d4f87dffec1491f294f8716a6f (patch)
tree990db2586cb482048e032a00adf7e0f80c0733f2
parent45d4cee226f7d9d867bae619bd8b1f8c3e8cd7f0 (diff)
downloadupstream-0fa08e885c4b83d4f87dffec1491f294f8716a6f.tar.gz
upstream-0fa08e885c4b83d4f87dffec1491f294f8716a6f.tar.bz2
upstream-0fa08e885c4b83d4f87dffec1491f294f8716a6f.zip
ath5k: fix tx queue limit for the cabq, fixes warning described in #9465
SVN-Revision: 27367
-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 0000000000..ade0eeff85
--- /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);
+ }
+