diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 37837f7b6990..c840c78278db 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -39,11 +39,8 @@ | |||
39 | #include "iwl-dev.h" | 39 | #include "iwl-dev.h" |
40 | #include "iwl-core.h" | 40 | #include "iwl-core.h" |
41 | #include "iwl-io.h" | 41 | #include "iwl-io.h" |
42 | #include "iwl-sta.h" | ||
43 | #include "iwl-agn.h" | 42 | #include "iwl-agn.h" |
44 | #include "iwl-helpers.h" | ||
45 | #include "iwl-agn-hw.h" | 43 | #include "iwl-agn-hw.h" |
46 | #include "iwl-6000-hw.h" | ||
47 | #include "iwl-trans.h" | 44 | #include "iwl-trans.h" |
48 | #include "iwl-shared.h" | 45 | #include "iwl-shared.h" |
49 | #include "iwl-cfg.h" | 46 | #include "iwl-cfg.h" |
@@ -147,7 +144,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) | |||
147 | iwlagn_mod_params.num_of_queues; | 144 | iwlagn_mod_params.num_of_queues; |
148 | 145 | ||
149 | hw_params(priv).max_txq_num = priv->cfg->base_params->num_of_queues; | 146 | hw_params(priv).max_txq_num = priv->cfg->base_params->num_of_queues; |
150 | hw_params(priv).max_stations = IWLAGN_STATION_COUNT; | ||
151 | priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID; | 147 | priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID; |
152 | 148 | ||
153 | hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE; | 149 | hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE; |
@@ -188,7 +184,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, | |||
188 | { | 184 | { |
189 | /* | 185 | /* |
190 | * MULTI-FIXME | 186 | * MULTI-FIXME |
191 | * See iwl_mac_channel_switch. | 187 | * See iwlagn_mac_channel_switch. |
192 | */ | 188 | */ |
193 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | 189 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; |
194 | struct iwl6000_channel_switch_cmd cmd; | 190 | struct iwl6000_channel_switch_cmd cmd; |
@@ -394,6 +390,12 @@ struct iwl_cfg iwl6005_2agn_sff_cfg = { | |||
394 | .ht_params = &iwl6000_ht_params, | 390 | .ht_params = &iwl6000_ht_params, |
395 | }; | 391 | }; |
396 | 392 | ||
393 | struct iwl_cfg iwl6005_2agn_d_cfg = { | ||
394 | .name = "Intel(R) Centrino(R) Advanced-N 6205D AGN", | ||
395 | IWL_DEVICE_6005, | ||
396 | .ht_params = &iwl6000_ht_params, | ||
397 | }; | ||
398 | |||
397 | #define IWL_DEVICE_6030 \ | 399 | #define IWL_DEVICE_6030 \ |
398 | .fw_name_pre = IWL6030_FW_PRE, \ | 400 | .fw_name_pre = IWL6030_FW_PRE, \ |
399 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | 401 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |