]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: mac80211: always send max agg subframe num in strict mode
authorJohannes Berg <johannes.berg@intel.com>
Wed, 5 Feb 2025 09:39:23 +0000 (11:39 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 11 Feb 2025 10:59:08 +0000 (11:59 +0100)
Instead of only sending the correct number for EHT and up,
always send the correct number as it should be in strict
mode.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250205110958.5910263db6da.Icd1f93fabc9705e4e760d834095c29b60b934d9e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/agg-tx.c

index 61f2cac37728ce2bb48a881be33265a55ca71eeb..92120f9051499a284104962f589bde3117635b4b 100644 (file)
@@ -9,7 +9,7 @@
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007-2010, Intel Corporation
  * Copyright(c) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018 - 2023 Intel Corporation
+ * Copyright (C) 2018 - 2024 Intel Corporation
  */
 
 #include <linux/ieee80211.h>
@@ -464,7 +464,8 @@ static void ieee80211_send_addba_with_timeout(struct sta_info *sta,
        sta->ampdu_mlme.addba_req_num[tid]++;
        spin_unlock_bh(&sta->lock);
 
-       if (sta->sta.deflink.eht_cap.has_eht) {
+       if (sta->sta.deflink.eht_cap.has_eht ||
+           ieee80211_hw_check(&local->hw, STRICT)) {
                buf_size = local->hw.max_tx_aggregation_subframes;
        } else if (sta->sta.deflink.he_cap.has_he) {
                buf_size = min_t(u16, local->hw.max_tx_aggregation_subframes,