iwlwifi: config: remove max_rx_agg_size

This field isn't set by any configuration, remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 59bb960b460ade5a6e6ba0aef3b03d8593c738ba..317eac06608227041ca7965f1b009b4f7c291db7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -409,7 +409,6 @@ struct iwl_fw_mon_regs {
  * @mac_addr_from_csr: read HW address from CSR registers
  * @features: hw features, any combination of feature_whitelist
  * @pwr_tx_backoffs: translation table between power limits and backoffs
- * @max_rx_agg_size: max RX aggregation size of the ADDBA request/response
  * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response
  * @max_ht_ampdu_factor: the exponent of the max length of A-MPDU that the
  *     station can receive in HT
@@ -481,7 +480,6 @@ struct iwl_cfg {
        u8 valid_rx_ant;
        u8 non_shared_ant;
        u8 nvm_hw_section_num;
-       u8 max_rx_agg_size;
        u8 max_tx_agg_size;
        u8 max_ht_ampdu_exponent;
        u8 max_vht_ampdu_exponent;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 3b0637311e3cd15950c33dc5f8566a4a911c5b0e..1b07a8e8f0695598139497e1f26895f0163b98fe 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -664,10 +664,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
        if (!hw)
                return NULL;
 
-       if (cfg->max_rx_agg_size)
-               hw->max_rx_aggregation_subframes = cfg->max_rx_agg_size;
-       else
-               hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;
+       hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;
 
        if (cfg->max_tx_agg_size)
                hw->max_tx_aggregation_subframes = cfg->max_tx_agg_size;