aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c14eda048948..e1bf12578f87 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1124,13 +1124,12 @@ static void iwl_set_hw_params(struct iwl_priv *priv)
1124 get_order(IWL_RX_BUF_SIZE_4K); 1124 get_order(IWL_RX_BUF_SIZE_4K);
1125 1125
1126 if (iwlagn_mod_params.disable_11n & IWL_DISABLE_HT_ALL) 1126 if (iwlagn_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
1127 cfg(priv)->sku &= ~EEPROM_SKU_CAP_11N_ENABLE; 1127 hw_params(priv).sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
1128 1128
1129 hw_params(priv).num_ampdu_queues = 1129 hw_params(priv).num_ampdu_queues =
1130 cfg(priv)->base_params->num_of_ampdu_queues; 1130 cfg(priv)->base_params->num_of_ampdu_queues;
1131 hw_params(priv).shadow_reg_enable = 1131 hw_params(priv).shadow_reg_enable =
1132 cfg(priv)->base_params->shadow_reg_enable; 1132 cfg(priv)->base_params->shadow_reg_enable;
1133 hw_params(priv).sku = cfg(priv)->sku;
1134 hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout; 1133 hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout;
1135 1134
1136 /* Device-specific setup */ 1135 /* Device-specific setup */
@@ -1257,7 +1256,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans)
1257 if (err) 1256 if (err)
1258 goto out_free_eeprom; 1257 goto out_free_eeprom;
1259 1258
1260 err = iwl_eeprom_check_sku(priv); 1259 err = iwl_eeprom_init_hw_params(priv);
1261 if (err) 1260 if (err)
1262 goto out_free_eeprom; 1261 goto out_free_eeprom;
1263 1262