ath5k: fix tx queue limit for the cabq, fixes warning described in #9465
authorFelix Fietkau <nbd@openwrt.org>
Sun, 3 Jul 2011 01:08:53 +0000 (01:08 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 3 Jul 2011 01:08:53 +0000 (01:08 +0000)
SVN-Revision: 27367

package/mac80211/patches/447-ath5k_fix_queue_stop_warning.patch [new file with mode: 0644]

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 (file)
index 0000000..ade0eef
--- /dev/null
@@ -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);
+       }