wireless: rename IEEE80211_CHAN_NO_FAT_* to HT40-/+

This is more consistent with our nl80211 naming convention
for HT40-/+.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 5393fb3f452c260f282a7bfe879ab6db9d6ea0c7..6c1b171d92bea804f793236fe41da6f864fe2eab 100644 (file)
--- 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,
 
        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
                return !(ch_info->fat_extension_channel &
-                                       IEEE80211_CHAN_NO_FAT_ABOVE);
+                                       IEEE80211_CHAN_NO_HT40PLUS);
        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
                return !(ch_info->fat_extension_channel &
-                                       IEEE80211_CHAN_NO_FAT_BELOW);
+                                       IEEE80211_CHAN_NO_HT40MINUS);
 
        return 0;
 }

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 401438aec19c9dd21c7bb950c0945294e2b998d6..b400bd510fc5dcd52904ad812046be9e75a7b423 100644 (file)
--- 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)
                        /* 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);
+                               (IEEE80211_CHAN_NO_HT40PLUS |
+                                IEEE80211_CHAN_NO_HT40MINUS);
 
                        if (!(is_channel_valid(ch_info))) {
                                IWL_DEBUG_INFO(priv, "Ch. %d Flags %x [%sGHz] - "
@@ -561,7 +561,7 @@ int iwl_init_channel_map(struct iwl_priv *priv)
                                fat_extension_chan = 0;
                        else
                                fat_extension_chan =
-                                       IEEE80211_CHAN_NO_FAT_BELOW;
+                                       IEEE80211_CHAN_NO_HT40MINUS;
 
                        /* Set up driver's info for lower half */
                        iwl_set_fat_chan_info(priv, ieeeband,
@@ -573,7 +573,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]),
-                                               IEEE80211_CHAN_NO_FAT_ABOVE);
+                                               IEEE80211_CHAN_NO_HT40PLUS);
                }
        }
 

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 282d58d52fceeb7276fce32e4dee6c118db2c67d..7391ad10c8c023bcf4dc467c6d8193618dde41a7 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -56,9 +56,9 @@ enum ieee80211_band {
  *     on this channel.
  * @IEEE80211_CHAN_NO_IBSS: IBSS is not allowed on this channel.
  * @IEEE80211_CHAN_RADAR: Radar detection is required on this channel.
- * @IEEE80211_CHAN_NO_FAT_ABOVE: extension channel above this channel
+ * @IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel
  *     is not permitted.
- * @IEEE80211_CHAN_NO_FAT_BELOW: extension channel below this channel
+ * @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel
  *     is not permitted.
  */
 enum ieee80211_channel_flags {
@@ -66,12 +66,12 @@ enum ieee80211_channel_flags {
        IEEE80211_CHAN_PASSIVE_SCAN     = 1<<1,
        IEEE80211_CHAN_NO_IBSS          = 1<<2,
        IEEE80211_CHAN_RADAR            = 1<<3,
-       IEEE80211_CHAN_NO_FAT_ABOVE     = 1<<4,
-       IEEE80211_CHAN_NO_FAT_BELOW     = 1<<5,
+       IEEE80211_CHAN_NO_HT40PLUS      = 1<<4,
+       IEEE80211_CHAN_NO_HT40MINUS     = 1<<5,
 };
 
 #define IEEE80211_CHAN_NO_HT40 \
-       (IEEE80211_CHAN_NO_FAT_ABOVE | IEEE80211_CHAN_NO_FAT_BELOW)
+       (IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)
 
 /**
  * struct ieee80211_channel - channel definition

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ae030688771f230db69fecd888d6ace6c6830ea7..da582b643b9a6ed03a4f4878ef806bde9f7259cd 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -349,13 +349,13 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
 
                switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
                case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                       if (flags & IEEE80211_CHAN_NO_FAT_ABOVE) {
+                       if (flags & IEEE80211_CHAN_NO_HT40PLUS) {
                                cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
                                cap &= ~IEEE80211_HT_CAP_SGI_40;
                        }
                        break;
                case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                       if (flags & IEEE80211_CHAN_NO_FAT_BELOW) {
+                       if (flags & IEEE80211_CHAN_NO_HT40MINUS) {
                                cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
                                cap &= ~IEEE80211_HT_CAP_SGI_40;
                        }

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index d897528ee7fcc617d82064a4f609832fe837c7a9..48db569d4c6b47c2e7d95ee37db0144f10ce7dc0 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1226,14 +1226,14 @@ static void reg_process_ht_flags_channel(struct wiphy *wiphy,
         * to include that as well.
         */
        if (is_ht40_not_allowed(channel_before))
-               channel->flags |= IEEE80211_CHAN_NO_FAT_BELOW;
+               channel->flags |= IEEE80211_CHAN_NO_HT40MINUS;
        else
-               channel->flags &= ~IEEE80211_CHAN_NO_FAT_BELOW;
+               channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
 
        if (is_ht40_not_allowed(channel_after))
-               channel->flags |= IEEE80211_CHAN_NO_FAT_ABOVE;
+               channel->flags |= IEEE80211_CHAN_NO_HT40PLUS;
        else
-               channel->flags &= ~IEEE80211_CHAN_NO_FAT_ABOVE;
+               channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
 }
 
 static void reg_process_ht_flags_band(struct wiphy *wiphy,