wifi: iwlwifi: cfg: remove max_tx_agg_size

This was used in some really old devices, and then got
carried forward to Qu devices, even though on those we
don't need it at all since the TX aggregation start is
offloaded to the firmware. Remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502151751.9c2689e2ca8e.I8274b29ca64d9ef9d1e357bbe34ca3a4b97aeb7a@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index 4affcf079a855fcb41428f70586bbf04eaa8d238..70005e6b2d57d8d45199b8198d0c9577f04de0b9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -178,12 +178,6 @@ const struct iwl_cfg iwl9560_qu_jf_cfg = {
 const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = {
        .fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
        IWL_DEVICE_22500,
-       /*
-        * This device doesn't support receiving BlockAck with a large bitmap
-        * so we need to restrict the size of transmitted aggregation to the
-        * HT size; mac80211 would otherwise pick the HE max (256) by default.
-        */
-       .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
        .num_rbds = IWL_NUM_RBDS_NON_HE,
 };
 
@@ -212,48 +206,24 @@ const char iwl_ax201_killer_1650i_name[] =
 
 const struct iwl_cfg iwl_qu_hr1 = {
        IWL_DEVICE_22500,
-       /*
-        * This device doesn't support receiving BlockAck with a large bitmap
-        * so we need to restrict the size of transmitted aggregation to the
-        * HT size; mac80211 would otherwise pick the HE max (256) by default.
-        */
-       .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
        .tx_with_siso_diversity = true,
        .num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg iwl_qu_hr = {
        IWL_DEVICE_22500,
-       /*
-        * This device doesn't support receiving BlockAck with a large bitmap
-        * so we need to restrict the size of transmitted aggregation to the
-        * HT size; mac80211 would otherwise pick the HE max (256) by default.
-        */
-       .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
        .num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg iwl_ax201_cfg_qu_hr = {
        .name = "Intel(R) Wi-Fi 6 AX201 160MHz",
        IWL_DEVICE_22500,
-       /*
-        * This device doesn't support receiving BlockAck with a large bitmap
-        * so we need to restrict the size of transmitted aggregation to the
-        * HT size; mac80211 would otherwise pick the HE max (256) by default.
-        */
-       .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
        .num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg iwl_ax200_cfg_cc = {
        .fw_name_pre = IWL_CC_A_FW_PRE,
        IWL_DEVICE_22500,
-       /*
-        * This device doesn't support receiving BlockAck with a large bitmap
-        * so we need to restrict the size of transmitted aggregation to the
-        * HT size; mac80211 would otherwise pick the HE max (256) by default.
-        */
-       .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
        .num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index b9f6f122e7526f71d8d2bc0eb9457764d3e6714a..26d0faa44695b9fb53024331acd7423c83b36bc6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -334,7 +334,6 @@ struct iwl_fw_mon_regs {
  * @mac_addr_from_csr: read HW address from CSR registers at this offset
  * @features: hw features, any combination of feature_passlist
  * @pwr_tx_backoffs: translation table between power limits and backoffs
- * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response
  * @dccm_offset: offset from which DCCM begins
  * @dccm_len: length of DCCM (including runtime stack CCM)
  * @dccm2_offset: offset from which the second DCCM begins
@@ -397,7 +396,6 @@ struct iwl_cfg {
        u8 valid_rx_ant;
        u8 non_shared_ant;
        u8 nvm_hw_section_num;
-       u8 max_tx_agg_size;
        u8 ucode_api_max;
        u8 ucode_api_min;
        u16 num_rbds;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 76603ef02704a6ff05608952f61ae4d1462476f5..14932700c6f9e95b2d8f91c734127b004f231b2d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1313,11 +1313,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
        hw->max_rx_aggregation_subframes = max_agg;
 
-       if (cfg->max_tx_agg_size)
-               hw->max_tx_aggregation_subframes = cfg->max_tx_agg_size;
-       else
-               hw->max_tx_aggregation_subframes = max_agg;
-
        op_mode = hw->priv;
 
        mvm = IWL_OP_MODE_GET_MVM(op_mode);