diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f1c1db76b9da..965d010794b4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -157,7 +157,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) | |||
157 | 157 | ||
158 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | | 158 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | |
159 | BIT(IEEE80211_BAND_5GHZ); | 159 | BIT(IEEE80211_BAND_5GHZ); |
160 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; | ||
161 | 160 | ||
162 | priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); | 161 | priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); |
163 | if (priv->cfg->rx_with_siso_diversity) | 162 | if (priv->cfg->rx_with_siso_diversity) |
@@ -328,27 +327,23 @@ static struct iwl_nic_ops iwl6150_nic_ops = { | |||
328 | 327 | ||
329 | static const struct iwl_ops iwl6000_ops = { | 328 | static const struct iwl_ops iwl6000_ops = { |
330 | .lib = &iwl6000_lib, | 329 | .lib = &iwl6000_lib, |
331 | .hcmd = &iwlagn_hcmd, | ||
332 | .utils = &iwlagn_hcmd_utils, | 330 | .utils = &iwlagn_hcmd_utils, |
333 | }; | 331 | }; |
334 | 332 | ||
335 | static const struct iwl_ops iwl6050_ops = { | 333 | static const struct iwl_ops iwl6050_ops = { |
336 | .lib = &iwl6000_lib, | 334 | .lib = &iwl6000_lib, |
337 | .hcmd = &iwlagn_hcmd, | ||
338 | .utils = &iwlagn_hcmd_utils, | 335 | .utils = &iwlagn_hcmd_utils, |
339 | .nic = &iwl6050_nic_ops, | 336 | .nic = &iwl6050_nic_ops, |
340 | }; | 337 | }; |
341 | 338 | ||
342 | static const struct iwl_ops iwl6150_ops = { | 339 | static const struct iwl_ops iwl6150_ops = { |
343 | .lib = &iwl6000_lib, | 340 | .lib = &iwl6000_lib, |
344 | .hcmd = &iwlagn_hcmd, | ||
345 | .utils = &iwlagn_hcmd_utils, | 341 | .utils = &iwlagn_hcmd_utils, |
346 | .nic = &iwl6150_nic_ops, | 342 | .nic = &iwl6150_nic_ops, |
347 | }; | 343 | }; |
348 | 344 | ||
349 | static const struct iwl_ops iwl6030_ops = { | 345 | static const struct iwl_ops iwl6030_ops = { |
350 | .lib = &iwl6030_lib, | 346 | .lib = &iwl6030_lib, |
351 | .hcmd = &iwlagn_bt_hcmd, | ||
352 | .utils = &iwlagn_hcmd_utils, | 347 | .utils = &iwlagn_hcmd_utils, |
353 | }; | 348 | }; |
354 | 349 | ||