Commit eebe75d1 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: remove max_vht_ampdu_exponent config parameter 



This is not (or no longer) used, so remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210210171218.ed18d7c8e7b8.Ic3fdf7c8636f332e3d5ee5841b03bf85e3bc4855@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9ce505fe

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −3
Original line number Diff line number Diff line
@@ -327,8 +327,6 @@ struct iwl_fw_mon_regs { 
 * @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

 * @max_vht_ampdu_exponent: the exponent of the max length of A-MPDU that the

 *	station can receive in VHT

 * @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
@@ -396,7 +394,6 @@ struct iwl_cfg { 
	u8 nvm_hw_section_num;

	u8 max_tx_agg_size;

	u8 max_ht_ampdu_exponent;

	u8 max_vht_ampdu_exponent;

	u8 ucode_api_max;

	u8 ucode_api_min;

	u16 num_rbds;

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+1 −3
Original line number Diff line number Diff line
@@ -453,8 +453,6 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans, 
	const struct iwl_cfg *cfg = trans->cfg;

	int num_rx_ants = num_of_ant(rx_chains);

	int num_tx_ants = num_of_ant(tx_chains);

	unsigned int max_ampdu_exponent = (cfg->max_vht_ampdu_exponent ?:

					   IEEE80211_VHT_MAX_AMPDU_1024K);



	vht_cap->vht_supported = true;
@@ -462,7 +460,7 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans, 
		       IEEE80211_VHT_CAP_RXSTBC_1 |

		       IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |

		       3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT |

		       max_ampdu_exponent <<

		       IEEE80211_VHT_MAX_AMPDU_1024K <<

		       IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;



	if (data->vht160_supported)