mac80211: backport latest version from trunk as of r27395
[openwrt-10.03/.git] / package / mac80211 / patches / 447-ath5k_fix_queue_stop_warning.patch
1 --- a/drivers/net/wireless/ath/ath5k/base.c
2 +++ b/drivers/net/wireless/ath/ath5k/base.c
3 @@ -1555,7 +1555,8 @@ ath5k_tx_queue(struct ieee80211_hw *hw, 
4                 goto drop_packet;
5         }
6  
7 -       if (txq->txq_len >= txq->txq_max)
8 +       if (txq->txq_len >= txq->txq_max &&
9 +           txq->qnum <= AR5K_TX_QUEUE_ID_DATA_MAX)
10                 ieee80211_stop_queue(hw, txq->qnum);
11  
12         spin_lock_irqsave(&sc->txbuflock, flags);
13 @@ -1931,6 +1932,10 @@ ath5k_beacon_send(struct ath5k_softc *sc
14         skb = ieee80211_get_buffered_bc(sc->hw, vif);
15         while (skb) {
16                 ath5k_tx_queue(sc->hw, skb, sc->cabq);
17 +
18 +               if (sc->cabq->txq_len >= sc->cabq->txq_max)
19 +                       break;
20 +
21                 skb = ieee80211_get_buffered_bc(sc->hw, vif);
22         }
23