forked from LiBwrt/openwrt-6.x
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mac80211: fix regression in SSN handling of addba tx
Some drivers that do their own sequence number allocation (e.g. ath9k, mwlwifi) 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. Signed-off-by: Felix Fietkau <[email protected]>
- Loading branch information
Showing
1 changed file
with
44 additions
and
0 deletions.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
...nel/mac80211/patches/subsys/305-mac80211-fix-regression-in-SSN-handling-of-addba-tx.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
From: Felix Fietkau <[email protected]> | ||
Date: Wed, 24 Nov 2021 10:30:41 +0100 | ||
Subject: [PATCH] mac80211: fix regression in SSN handling of addba tx | ||
|
||
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: [email protected] | ||
Fixes: 31d8bb4e07f8 ("mac80211: agg-tx: refactor sending addba") | ||
Reported-by: Eneas U de Queiroz <[email protected]> | ||
Signed-off-by: Felix Fietkau <[email protected]> | ||
--- | ||
|
||
--- a/net/mac80211/agg-tx.c | ||
+++ b/net/mac80211/agg-tx.c | ||
@@ -480,8 +480,7 @@ static void ieee80211_send_addba_with_ti | ||
|
||
/* 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); | ||
|
||
WARN_ON(test_and_set_bit(HT_AGG_STATE_SENT_ADDBA, &tid_tx->state)); | ||
@@ -523,6 +522,7 @@ void ieee80211_tx_ba_session_handle_star | ||
|
||
params.ssn = sta->tid_seq[tid] >> 4; | ||
ret = drv_ampdu_action(local, sdata, ¶ms); | ||
+ tid_tx->ssn = params.ssn; | ||
if (ret == IEEE80211_AMPDU_TX_START_DELAY_ADDBA) { | ||
return; | ||
} else if (ret == IEEE80211_AMPDU_TX_START_IMMEDIATE) { | ||
--- a/net/mac80211/sta_info.h | ||
+++ b/net/mac80211/sta_info.h | ||
@@ -199,6 +199,7 @@ struct tid_ampdu_tx { | ||
u8 stop_initiator; | ||
bool tx_stop; | ||
u16 buf_size; | ||
+ u16 ssn; | ||
|
||
u16 failed_bar_ssn; | ||
bool bar_pending; |