diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 5393fb3f452c..6c1b171d92be 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -603,10 +603,10 @@ static u8 iwl_is_channel_extension(struct iwl_priv *priv, | |||
603 | 603 | ||
604 | if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE) | 604 | if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE) |
605 | return !(ch_info->fat_extension_channel & | 605 | return !(ch_info->fat_extension_channel & |
606 | IEEE80211_CHAN_NO_FAT_ABOVE); | 606 | IEEE80211_CHAN_NO_HT40PLUS); |
607 | else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW) | 607 | else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW) |
608 | return !(ch_info->fat_extension_channel & | 608 | return !(ch_info->fat_extension_channel & |
609 | IEEE80211_CHAN_NO_FAT_BELOW); | 609 | IEEE80211_CHAN_NO_HT40MINUS); |
610 | 610 | ||
611 | return 0; | 611 | return 0; |
612 | } | 612 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index 401438aec19c..b400bd510fc5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
@@ -481,8 +481,8 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
481 | /* First write that fat is not enabled, and then enable | 481 | /* First write that fat is not enabled, and then enable |
482 | * one by one */ | 482 | * one by one */ |
483 | ch_info->fat_extension_channel = | 483 | ch_info->fat_extension_channel = |
484 | (IEEE80211_CHAN_NO_FAT_ABOVE | | 484 | (IEEE80211_CHAN_NO_HT40PLUS | |
485 | IEEE80211_CHAN_NO_FAT_BELOW); | 485 | IEEE80211_CHAN_NO_HT40MINUS); |
486 | 486 | ||
487 | if (!(is_channel_valid(ch_info))) { | 487 | if (!(is_channel_valid(ch_info))) { |
488 | IWL_DEBUG_INFO(priv, "Ch. %d Flags %x [%sGHz] - " | 488 | IWL_DEBUG_INFO(priv, "Ch. %d Flags %x [%sGHz] - " |
@@ -561,7 +561,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
561 | fat_extension_chan = 0; | 561 | fat_extension_chan = 0; |
562 | else | 562 | else |
563 | fat_extension_chan = | 563 | fat_extension_chan = |
564 | IEEE80211_CHAN_NO_FAT_BELOW; | 564 | IEEE80211_CHAN_NO_HT40MINUS; |
565 | 565 | ||
566 | /* Set up driver's info for lower half */ | 566 | /* Set up driver's info for lower half */ |
567 | iwl_set_fat_chan_info(priv, ieeeband, | 567 | iwl_set_fat_chan_info(priv, ieeeband, |
@@ -573,7 +573,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
573 | iwl_set_fat_chan_info(priv, ieeeband, | 573 | iwl_set_fat_chan_info(priv, ieeeband, |
574 | (eeprom_ch_index[ch] + 4), | 574 | (eeprom_ch_index[ch] + 4), |
575 | &(eeprom_ch_info[ch]), | 575 | &(eeprom_ch_info[ch]), |
576 | IEEE80211_CHAN_NO_FAT_ABOVE); | 576 | IEEE80211_CHAN_NO_HT40PLUS); |
577 | } | 577 | } |
578 | } | 578 | } |
579 | 579 | ||