diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-11-24 10:40:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-22 09:29:40 +0100 |
| commit | 96a1550a2b43f021a95084ccb136a208b4edcc2e (patch) | |
| tree | c4dcada03ad9a2b76d355b0348cfab0f43f55efb | |
| parent | 66aba15a144a41162502d1fbe6ec4b4d006d9ad3 (diff) | |
| download | linux-stable-96a1550a2b43f021a95084ccb136a208b4edcc2e.tar.gz linux-stable-96a1550a2b43f021a95084ccb136a208b4edcc2e.tar.bz2 linux-stable-96a1550a2b43f021a95084ccb136a208b4edcc2e.zip | |
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: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20211124094024.43222-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/mac80211/agg-tx.c | 4 | ||||
| -rw-r--r-- | net/mac80211/sta_info.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 8d3b905e551a..f140c2b94b2c 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -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, ¶ms); + tid_tx->ssn = params.ssn; if (ret) { ht_dbg(sdata, "BA request denied - HW unavailable for %pM tid %d\n", diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 2eb73be9b986..be0df78d4a79 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -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; |