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

Commit 96a1550a authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

mac80211: fix regression in SSN handling of addba tx 



commit 73111efacd3c6d9e644acca1d132566932be8af0 upstream.

Some drivers that do their own sequence number allocation (e.g. ath9k) rely
on being able to modify params->ssn on starting tx ampdu sessions.
This was broken by a change that modified it to use sta->tid_seq[tid] instead.

Cc: stable@vger.kernel.org
Fixes: 31d8bb4e07f8 ("mac80211: agg-tx: refactor sending addba")
Reported-by: default avatarEneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20211124094024.43222-1-nbd@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66aba15a

net/mac80211/agg-tx.c

+2 −2
Original line number Diff line number Diff line
@@ -481,8 +481,7 @@ static void ieee80211_send_addba_with_timeout(struct sta_info *sta, 


	/* send AddBA request */

	ieee80211_send_addba_request(sdata, sta->sta.addr, tid,

				     tid_tx->dialog_token,

				     sta->tid_seq[tid] >> 4,

				     tid_tx->dialog_token, tid_tx->ssn,

				     buf_size, tid_tx->timeout);

}
@@ -522,6 +521,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 


	params.ssn = sta->tid_seq[tid] >> 4;

	ret = drv_ampdu_action(local, sdata, &params);

	tid_tx->ssn = params.ssn;

	if (ret) {

		ht_dbg(sdata,

		       "BA request denied - HW unavailable for %pM tid %d\n",

net/mac80211/sta_info.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ struct tid_ampdu_tx { 
	u8 stop_initiator;

	bool tx_stop;

	u16 buf_size;

	u16 ssn;



	u16 failed_bar_ssn;

	bool bar_pending;