diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 8b9c419e094e..bb8f00272af3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -4416,7 +4416,7 @@ static u8 iwl4965_is_channel_extension(struct iwl4965_priv *priv, | |||
4416 | if (!is_channel_valid(ch_info)) | 4416 | if (!is_channel_valid(ch_info)) |
4417 | return 0; | 4417 | return 0; |
4418 | 4418 | ||
4419 | if (extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_AUTO) | 4419 | if (extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_NONE) |
4420 | return 0; | 4420 | return 0; |
4421 | 4421 | ||
4422 | if ((ch_info->fat_extension_channel == extension_chan_offset) || | 4422 | if ((ch_info->fat_extension_channel == extension_chan_offset) || |
@@ -4433,7 +4433,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv, | |||
4433 | 4433 | ||
4434 | if ((!iwl_ht_conf->is_ht) || | 4434 | if ((!iwl_ht_conf->is_ht) || |
4435 | (iwl_ht_conf->supported_chan_width != IWL_CHANNEL_WIDTH_40MHZ) || | 4435 | (iwl_ht_conf->supported_chan_width != IWL_CHANNEL_WIDTH_40MHZ) || |
4436 | (iwl_ht_conf->extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_AUTO)) | 4436 | (iwl_ht_conf->extension_chan_offset == IWL_EXT_CHANNEL_OFFSET_NONE)) |
4437 | return 0; | 4437 | return 0; |
4438 | 4438 | ||
4439 | if (sta_ht_inf) { | 4439 | if (sta_ht_inf) { |
@@ -4478,9 +4478,7 @@ void iwl4965_set_rxon_ht(struct iwl4965_priv *priv, struct iwl_ht_info *ht_info) | |||
4478 | case IWL_EXT_CHANNEL_OFFSET_BELOW: | 4478 | case IWL_EXT_CHANNEL_OFFSET_BELOW: |
4479 | rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK; | 4479 | rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK; |
4480 | break; | 4480 | break; |
4481 | case IWL_EXT_CHANNEL_OFFSET_AUTO: | 4481 | case IWL_EXT_CHANNEL_OFFSET_NONE: |
4482 | rxon->flags &= ~RXON_FLG_CHANNEL_MODE_MIXED_MSK; | ||
4483 | break; | ||
4484 | default: | 4482 | default: |
4485 | rxon->flags &= ~RXON_FLG_CHANNEL_MODE_MIXED_MSK; | 4483 | rxon->flags &= ~RXON_FLG_CHANNEL_MODE_MIXED_MSK; |
4486 | break; | 4484 | break; |