Skip to content

L
linux
Commit 348ee7cd authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files
Options

iwlwifi: move agn module parameter structure to common place 

agn module parameter data structure shared by all agn devices, move it
iwl-agn-lib.c file.
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 00e70590
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
drivers/net/wireless/iwlwifi/iwl-1000.c
View file @ 348ee7cd
...@@ -237,7 +237,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { ...@@ -237,7 +237,7 @@ struct iwl_cfg iwl1000_bgn_cfg = {
.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_A, .valid_tx_ant = ANT_A,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -267,7 +267,7 @@ struct iwl_cfg iwl1000_bg_cfg = { ...@@ -267,7 +267,7 @@ struct iwl_cfg iwl1000_bg_cfg = {
.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_A, .valid_tx_ant = ANT_A,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
......
drivers/net/wireless/iwlwifi/iwl-5000.c
View file @ 348ee7cd
...@@ -397,13 +397,6 @@ static const struct iwl_ops iwl5150_ops = { ...@@ -397,13 +397,6 @@ static const struct iwl_ops iwl5150_ops = {
.led = &iwlagn_led_ops, .led = &iwlagn_led_ops,
}; };
struct iwl_mod_params iwl50_mod_params = {
.amsdu_size_8K = 1,
.restart_fw = 1,
/* the rest are 0 by default */
};
struct iwl_cfg iwl5300_agn_cfg = { struct iwl_cfg iwl5300_agn_cfg = {
.name = "Intel(R) Ultimate N WiFi Link 5300 AGN", .name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
.fw_name_pre = IWL5000_FW_PRE, .fw_name_pre = IWL5000_FW_PRE,
...@@ -416,7 +409,7 @@ struct iwl_cfg iwl5300_agn_cfg = { ...@@ -416,7 +409,7 @@ struct iwl_cfg iwl5300_agn_cfg = {
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_ABC, .valid_tx_ant = ANT_ABC,
.valid_rx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -443,7 +436,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { ...@@ -443,7 +436,7 @@ struct iwl_cfg iwl5100_bgn_cfg = {
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_B, .valid_tx_ant = ANT_B,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -470,7 +463,7 @@ struct iwl_cfg iwl5100_abg_cfg = { ...@@ -470,7 +463,7 @@ struct iwl_cfg iwl5100_abg_cfg = {
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_B, .valid_tx_ant = ANT_B,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -495,7 +488,7 @@ struct iwl_cfg iwl5100_agn_cfg = { ...@@ -495,7 +488,7 @@ struct iwl_cfg iwl5100_agn_cfg = {
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_B, .valid_tx_ant = ANT_B,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -522,7 +515,7 @@ struct iwl_cfg iwl5350_agn_cfg = { ...@@ -522,7 +515,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_ABC, .valid_tx_ant = ANT_ABC,
.valid_rx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -549,7 +542,7 @@ struct iwl_cfg iwl5150_agn_cfg = { ...@@ -549,7 +542,7 @@ struct iwl_cfg iwl5150_agn_cfg = {
.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_A, .valid_tx_ant = ANT_A,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -576,7 +569,7 @@ struct iwl_cfg iwl5150_abg_cfg = { ...@@ -576,7 +569,7 @@ struct iwl_cfg iwl5150_abg_cfg = {
.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_A, .valid_tx_ant = ANT_A,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
...@@ -592,15 +585,15 @@ struct iwl_cfg iwl5150_abg_cfg = { ...@@ -592,15 +585,15 @@ struct iwl_cfg iwl5150_abg_cfg = {
MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));
module_param_named(swcrypto50, iwl50_mod_params.sw_crypto, bool, S_IRUGO); module_param_named(swcrypto50, iwlagn_mod_params.sw_crypto, bool, S_IRUGO);
MODULE_PARM_DESC(swcrypto50, MODULE_PARM_DESC(swcrypto50,
"using software crypto engine (default 0 [hardware])\n"); "using software crypto engine (default 0 [hardware])\n");
module_param_named(queues_num50, iwl50_mod_params.num_of_queues, int, S_IRUGO); module_param_named(queues_num50, iwlagn_mod_params.num_of_queues, int, S_IRUGO);
MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series"); MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series");
module_param_named(11n_disable50, iwl50_mod_params.disable_11n, int, S_IRUGO); module_param_named(11n_disable50, iwlagn_mod_params.disable_11n, int, S_IRUGO);
MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality"); MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality");
module_param_named(amsdu_size_8K50, iwl50_mod_params.amsdu_size_8K, module_param_named(amsdu_size_8K50, iwlagn_mod_params.amsdu_size_8K,
int, S_IRUGO); int, S_IRUGO);
MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series"); MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series");
module_param_named(fw_restart50, iwl50_mod_params.restart_fw, int, S_IRUGO); module_param_named(fw_restart50, iwlagn_mod_params.restart_fw, int, S_IRUGO);
MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error"); MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error");
drivers/net/wireless/iwlwifi/iwl-6000.c
View file @ 348ee7cd
...@@ -374,7 +374,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { ...@@ -374,7 +374,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = {
.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_BC, .valid_tx_ant = ANT_BC,
.valid_rx_ant = ANT_BC, .valid_rx_ant = ANT_BC,
.pll_cfg_val = 0, .pll_cfg_val = 0,
...@@ -407,7 +407,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { ...@@ -407,7 +407,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = {
.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_BC, .valid_tx_ant = ANT_BC,
.valid_rx_ant = ANT_BC, .valid_rx_ant = ANT_BC,
.pll_cfg_val = 0, .pll_cfg_val = 0,
...@@ -439,7 +439,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { ...@@ -439,7 +439,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_BC, .valid_tx_ant = ANT_BC,
.valid_rx_ant = ANT_BC, .valid_rx_ant = ANT_BC,
.pll_cfg_val = 0, .pll_cfg_val = 0,
...@@ -471,7 +471,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { ...@@ -471,7 +471,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_AB, .valid_tx_ant = ANT_AB,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = 0, .pll_cfg_val = 0,
...@@ -504,7 +504,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { ...@@ -504,7 +504,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_AB, .valid_tx_ant = ANT_AB,
.valid_rx_ant = ANT_AB, .valid_rx_ant = ANT_AB,
.pll_cfg_val = 0, .pll_cfg_val = 0,
...@@ -536,7 +536,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { ...@@ -536,7 +536,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION, .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
.mod_params = &iwl50_mod_params, .mod_params = &iwlagn_mod_params,
.valid_tx_ant = ANT_ABC, .valid_tx_ant = ANT_ABC,
.valid_rx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC,
.pll_cfg_val = 0, .pll_cfg_val = 0,
......
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
View file @ 348ee7cd
...@@ -375,3 +375,9 @@ const u8 *iwlagn_eeprom_query_addr(const struct iwl_priv *priv, ...@@ -375,3 +375,9 @@ const u8 *iwlagn_eeprom_query_addr(const struct iwl_priv *priv,
BUG_ON(address >= priv->cfg->eeprom_size); BUG_ON(address >= priv->cfg->eeprom_size);
return &priv->eeprom[address]; return &priv->eeprom[address];
} }
struct iwl_mod_params iwlagn_mod_params = {
.amsdu_size_8K = 1,
.restart_fw = 1,
/* the rest are 0 by default */
};
drivers/net/wireless/iwlwifi/iwl-agn.h
View file @ 348ee7cd
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
#include "iwl-dev.h" #include "iwl-dev.h"
extern struct iwl_mod_params iwlagn_mod_params;
extern struct iwl_ucode_ops iwlagn_ucode; extern struct iwl_ucode_ops iwlagn_ucode;
extern struct iwl_hcmd_ops iwlagn_hcmd; extern struct iwl_hcmd_ops iwlagn_hcmd;
extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils; extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7