aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-05-02 00:37:18 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-05-20 14:46:22 -0400
commit689da1b3b8b37ff41e79f3fb973c06cdfeef12e5 (patch)
tree57accde02817fa1fdb61ddafd16263294e065ed8 /net
parent038659e7c6b385065cb223872771ac437ef70b62 (diff)
downloadmrst-s0i3-test-689da1b3b8b37ff41e79f3fb973c06cdfeef12e5.tar.gz
mrst-s0i3-test-689da1b3b8b37ff41e79f3fb973c06cdfeef12e5.tar.xz
mrst-s0i3-test-689da1b3b8b37ff41e79f3fb973c06cdfeef12e5.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c4
-rw-r--r--net/wireless/reg.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ae030688771..da582b643b9 100644
--- 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 d897528ee7f..48db569d4c6 100644
--- 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,