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>
This commit is contained in:
parent
038659e7c6
commit
689da1b3b8
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue