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

SVN-Revision: 27367
2011-07-03 01:08:53 +00:00 · 2011-07-03 01:08:53 +00:00 · 0fa08e885c
commit 0fa08e885c
parent 45d4cee226
1 changed files with 23 additions and 0 deletions
--- a/package/mac80211/patches/447-ath5k_fix_queue_stop_warning.patch
+++ 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);
+ 	}
+