aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-1000.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index baf80111efaf..d2b1be65f903 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -121,10 +121,10 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = {
121 121
122static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 122static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
123{ 123{
124 if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES && 124 if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&
125 priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES) 125 iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
126 priv->cfg->base_params->num_of_queues = 126 priv->cfg->base_params->num_of_queues =
127 priv->cfg->mod_params->num_of_queues; 127 iwlagn_mod_params.num_of_queues;
128 128
129 priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues; 129 priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;
130 priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; 130 priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
@@ -249,7 +249,6 @@ static struct iwl_ht_params iwl1000_ht_params = {
249 .eeprom_ver = EEPROM_1000_EEPROM_VERSION, \ 249 .eeprom_ver = EEPROM_1000_EEPROM_VERSION, \
250 .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, \ 250 .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, \
251 .ops = &iwl1000_ops, \ 251 .ops = &iwl1000_ops, \
252 .mod_params = &iwlagn_mod_params, \
253 .base_params = &iwl1000_base_params, \ 252 .base_params = &iwl1000_base_params, \
254 .led_mode = IWL_LED_BLINK 253 .led_mode = IWL_LED_BLINK
255 254
@@ -271,7 +270,6 @@ struct iwl_cfg iwl1000_bg_cfg = {
271 .eeprom_ver = EEPROM_1000_EEPROM_VERSION, \ 270 .eeprom_ver = EEPROM_1000_EEPROM_VERSION, \
272 .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, \ 271 .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, \
273 .ops = &iwl1000_ops, \ 272 .ops = &iwl1000_ops, \
274 .mod_params = &iwlagn_mod_params, \
275 .base_params = &iwl1000_base_params, \ 273 .base_params = &iwl1000_base_params, \
276 .led_mode = IWL_LED_RF_STATE, \ 274 .led_mode = IWL_LED_RF_STATE, \
277 .rx_with_siso_diversity = true 275 .rx_with_siso_diversity = true