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

Commit 8d9e464a authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Fix offchannel queuing 



Clearing IEEE80211_TX_CTL_PS_RESPONSE in a frame
that is not in the current context doesn't seem right.
Instead make sure that we don't add such frames
to the UAPSD queue by using a local variable.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c13a6a05

drivers/net/wireless/ath/ath9k/xmit.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2205,7 +2205,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
	struct ath_txq *txq = txctl->txq;

	struct ath_txq *txq = txctl->txq;

	struct ath_atx_tid *tid = NULL;

	struct ath_atx_tid *tid = NULL;

	struct ath_buf *bf;

	struct ath_buf *bf;

	bool queue;

	bool queue, skip_uapsd = false;

	int q, ret;

	int q, ret;





	if (vif)

	if (vif)
@@ -2246,14 +2246,14 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
	     sc->cur_chan->stopped) && !txctl->force_channel) {

	     sc->cur_chan->stopped) && !txctl->force_channel) {

		if (!txctl->an)

		if (!txctl->an)

			txctl->an = &avp->mcast_node;

			txctl->an = &avp->mcast_node;

		info->flags &= ~IEEE80211_TX_CTL_PS_RESPONSE;

		queue = true;

		queue = true;

		skip_uapsd = true;

	}

	}





	if (txctl->an && queue)

	if (txctl->an && queue)

		tid = ath_get_skb_tid(sc, txctl->an, skb);

		tid = ath_get_skb_tid(sc, txctl->an, skb);





	if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {

	if (!skip_uapsd && (info->flags & IEEE80211_TX_CTL_PS_RESPONSE)) {

		ath_txq_unlock(sc, txq);

		ath_txq_unlock(sc, txq);

		txq = sc->tx.uapsdq;

		txq = sc->tx.uapsdq;

		ath_txq_lock(sc, txq);

		ath_txq_lock(sc, txq);