From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 3 Jul 2011 01:08:53 +0000 (+0000)
Subject: ath5k: fix tx queue limit for the cabq, fixes warning described in #9465
X-Git-Tag: reboot~16416
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0fa08e885c4b83d4f87dffec1491f294f8716a6f;p=openwrt%2Fstaging%2Fpepe2k.git

ath5k: fix tx queue limit for the cabq, fixes warning described in #9465

SVN-Revision: 27367
---

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);
+ 	}
+