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

iwlwifi: remove max_ht_ampdu_exponent config parameter 



This always has the same value, since we don't have any
devices with different values; remove the parameter.

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.50d11cbb073f.Ia44d022a4c549eb5fe0254fb20c62aa8d0bba634@changeid


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

drivers/net/wireless/intel/iwlwifi/cfg/1000.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

/******************************************************************************

 *

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -76,8 +76,7 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl1000_base_params,		\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl1000_bgn_cfg = {

const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -102,8 +101,7 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.trans.base_params = &iwl1000_base_params,		\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.rx_with_siso_diversity = true

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl100_bgn_cfg = {

const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

drivers/net/wireless/intel/iwlwifi/cfg/2000.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

/******************************************************************************

 *

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -102,8 +102,7 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.trans.base_params = &iwl2000_base_params,		\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K









const struct iwl_cfg iwl2000_2bgn_cfg = {

const struct iwl_cfg iwl2000_2bgn_cfg = {
@@ -129,8 +128,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl2030_base_params,		\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl2030_2bgn_cfg = {

const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -150,8 +148,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.trans.base_params = &iwl2000_base_params,		\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.rx_with_siso_diversity = true

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl105_bgn_cfg = {

const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -177,8 +174,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.trans.base_params = &iwl2030_base_params,		\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.rx_with_siso_diversity = true

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl135_bgn_cfg = {

const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.mac_addr_from_csr = true,					\

	.mac_addr_from_csr = true,					\

	.ht_params = &iwl_22000_ht_params,				\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.trans.use_tfh = true,						\

	.trans.use_tfh = true,						\

	.trans.rf_id = true,						\

	.trans.rf_id = true,						\

	.trans.gen2 = true,						\

	.trans.gen2 = true,						\

drivers/net/wireless/intel/iwlwifi/cfg/5000.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

/******************************************************************************

 *

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -74,8 +74,7 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl5000_base_params,		\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl5300_agn_cfg = {

const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -138,8 +137,7 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.trans.base_params = &iwl5000_base_params,		\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.internal_wimax_coex = true

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl5150_agn_cfg = {

const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+7 −13
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

/******************************************************************************

 *

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -123,8 +123,7 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl6005_2agn_cfg = {

const struct iwl_cfg iwl6005_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",
@@ -177,8 +176,7 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = { 
	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl6030_2agn_cfg = {

const struct iwl_cfg iwl6030_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
@@ -213,8 +211,7 @@ const struct iwl_cfg iwl6030_2bg_cfg = { 
	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.led_mode = IWL_LED_RF_STATE

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl6035_2agn_cfg = {

const struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
@@ -268,8 +265,7 @@ const struct iwl_cfg iwl130_bg_cfg = { 
	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\

	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\

	.trans.base_params = &iwl6000_base_params,		\

	.trans.base_params = &iwl6000_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl6000i_2agn_cfg = {

const struct iwl_cfg iwl6000i_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
@@ -301,8 +297,7 @@ const struct iwl_cfg iwl6000i_2bg_cfg = { 
	.trans.base_params = &iwl6050_base_params,		\

	.trans.base_params = &iwl6050_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.internal_wimax_coex = true

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl6050_2agn_cfg = {

const struct iwl_cfg iwl6050_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
@@ -327,8 +322,7 @@ const struct iwl_cfg iwl6050_2abg_cfg = { 
	.trans.base_params = &iwl6050_base_params,		\

	.trans.base_params = &iwl6050_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.internal_wimax_coex = true

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl6150_bgn_cfg = {

const struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",