mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 04:56:14 +02:00
b776a26947
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27367 3c298f89-4303-0410-b956-a3cf2f4a3e73
24 lines
671 B
Diff
24 lines
671 B
Diff
--- 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);
|
|
}
|
|
|