]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: mt7925: fix AMPDU state handling in mt7925_tx_check_aggr
authorQuan Zhou <quan.zhou@mediatek.com>
Thu, 27 Nov 2025 07:49:11 +0000 (15:49 +0800)
committerFelix Fietkau <nbd@nbd.name>
Mon, 23 Mar 2026 09:14:42 +0000 (09:14 +0000)
Previously, the AMPDU state bit for a given TID was set before attempting
to start a BA session, which could result in the AMPDU state being marked
active even if ieee80211_start_tx_ba_session() failed. This patch changes
the logic to only set the AMPDU state bit after successfully starting a BA
session, ensuring proper synchronization between AMPDU state and BA session
status.

This fixes potential issues with aggregation state tracking and improves
compatibility with mac80211 BA session management.

Fixes: 44eb173bdd4f ("wifi: mt76: mt7925: add link handling in mt7925_txwi_free")
Cc: stable@vger.kernel.org
Signed-off-by: Quan Zhou <quan.zhou@mediatek.com>
Reviewed-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/d5960fbced0beaf33c30203f7f8fb91d0899c87b.1764228973.git.quan.zhou@mediatek.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7925/mac.c

index caaf71c314802dbe53151a8c40d8189b3f1c9e08..63e58c177d6567bd3890c782a81bd59b8d2c698e 100644 (file)
@@ -882,8 +882,10 @@ static void mt7925_tx_check_aggr(struct ieee80211_sta *sta, struct sk_buff *skb,
        else
                mlink = &msta->deflink;
 
-       if (!test_and_set_bit(tid, &mlink->wcid.ampdu_state))
-               ieee80211_start_tx_ba_session(sta, tid, 0);
+       if (!test_and_set_bit(tid, &mlink->wcid.ampdu_state)) {
+               if (ieee80211_start_tx_ba_session(sta, tid, 0))
+                       clear_bit(tid, &mlink->wcid.ampdu_state);
+       }
 }
 
 static bool