Commit c01fac1c authored Jul 23, 2014 by Felix Fietkau Committed by John W. Linville Jul 23, 2014

ath9k: fix aggregation session lockup



If an aggregation session fails, frames still end up in the driver queue
with IEEE80211_TX_CTL_AMPDU set.
This causes tx for the affected station/tid to stall, since
ath_tx_get_tid_subframe returning packets to send.

Fix this by clearing IEEE80211_TX_CTL_AMPDU as long as no aggregation
session is running.

Cc: stable@vger.kernel.org
Reported-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 3b8de074

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -887,6 +887,15 @@ ath_tx_get_tid_subframe(struct ath_softc sc, struct ath_txq txq,

		tx_info = IEEE80211_SKB_CB(skb);
		tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT;

		/*
		* No aggregation session is running, but there may be frames
		* from a previous session or a failed attempt in the queue.
		* Send them out as normal data frames
		*/
		if (!tid->active)
		tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU;

		if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
		bf->bf_state.bf_type = 0;
		return bf;