Skip to content

Commit

Permalink
ath5k: do not call ieee80211_stop_queue for queues not managed by mac…
Browse files Browse the repository at this point in the history
…80211

Instead of using ieee80211_stop_queue, check the configured tx queue
limit before calling ieee80211_get_buffered_bc.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Felix Fietkau authored and John W. Linville committed Jul 13, 2011
1 parent 6340211 commit 4e86879
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/net/wireless/ath/ath5k/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,8 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
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);
Expand Down Expand Up @@ -1930,6 +1931,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);
}

Expand Down

0 comments on commit 4e86879

Please sign in to comment.