Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e868796 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath5k: do not call ieee80211_stop_queue for queues not managed by mac80211 



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

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6340211c

drivers/net/wireless/ath/ath5k/base.c

+6 −1
Original line number Diff line number Diff line
@@ -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);
@@ -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);

	}