iwlwifi: remove redundant flags regarding to FAT channel

This patch removes redundant flags regarding to FAT channel. Use
mac80211's flag instead.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 11f9d9557a0e..cbb812f9f620 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -470,6 +470,11 @@ int iwl_init_channel_map(struct iwl_priv *priv)
                         /* Copy the run-time flags so they are there even on
                          * invalid channels */
                         ch_info->flags = eeprom_ch_info[ch].flags;
+                        /* First write that fat is not enabled, and then enable
+                         * one by one */
+                        ch_info->fat_extension_channel =
+                                (IEEE80211_CHAN_NO_FAT_ABOVE |
+                                 IEEE80211_CHAN_NO_FAT_BELOW);
 
                         if (!(is_channel_valid(ch_info))) {
                                 IWL_DEBUG_INFO("Ch. %d Flags %x [%sGHz] - "
@@ -534,12 +539,14 @@ int iwl_init_channel_map(struct iwl_priv *priv)
                 for (ch = 0; ch < eeprom_ch_count; ch++) {
 
                         if ((band == 6) &&
-                            ((eeprom_ch_index[ch] == 5) ||
-                            (eeprom_ch_index[ch] == 6) ||
-                            (eeprom_ch_index[ch] == 7)))
-                               fat_extension_chan = HT_IE_EXT_CHANNEL_MAX;
+                                ((eeprom_ch_index[ch] == 5) ||
+                                 (eeprom_ch_index[ch] == 6) ||
+                                 (eeprom_ch_index[ch] == 7)))
+                                /* both are allowed: above and below */
+                                fat_extension_chan = 0;
                         else
-                                fat_extension_chan = HT_IE_EXT_CHANNEL_ABOVE;
+                                fat_extension_chan =
+                                        IEEE80211_CHAN_NO_FAT_BELOW;
 
                         /* Set up driver's info for lower half */
                         iwl_set_fat_chan_info(priv, ieeeband,
@@ -551,7 +558,7 @@ int iwl_init_channel_map(struct iwl_priv *priv)
                         iwl_set_fat_chan_info(priv, ieeeband,
                                                 (eeprom_ch_index[ch] + 4),
                                                 &(eeprom_ch_info[ch]),
-                                                HT_IE_EXT_CHANNEL_BELOW);
+                                                IEEE80211_CHAN_NO_FAT_ABOVE);
                 }
         }