diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-05-02 00:37:18 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:22 -0400 |
commit | 689da1b3b8b37ff41e79f3fb973c06cdfeef12e5 (patch) | |
tree | 57accde02817fa1fdb61ddafd16263294e065ed8 /net | |
parent | 038659e7c6b385065cb223872771ac437ef70b62 (diff) |
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.c | 4 | ||||
-rw-r--r-- | net/wireless/reg.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index ae030688771f..da582b643b9a 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) | |||
349 | 349 | ||
350 | switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) { | 350 | switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) { |
351 | case IEEE80211_HT_PARAM_CHA_SEC_ABOVE: | 351 | case IEEE80211_HT_PARAM_CHA_SEC_ABOVE: |
352 | if (flags & IEEE80211_CHAN_NO_FAT_ABOVE) { | 352 | if (flags & IEEE80211_CHAN_NO_HT40PLUS) { |
353 | cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; | 353 | cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; |
354 | cap &= ~IEEE80211_HT_CAP_SGI_40; | 354 | cap &= ~IEEE80211_HT_CAP_SGI_40; |
355 | } | 355 | } |
356 | break; | 356 | break; |
357 | case IEEE80211_HT_PARAM_CHA_SEC_BELOW: | 357 | case IEEE80211_HT_PARAM_CHA_SEC_BELOW: |
358 | if (flags & IEEE80211_CHAN_NO_FAT_BELOW) { | 358 | if (flags & IEEE80211_CHAN_NO_HT40MINUS) { |
359 | cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; | 359 | cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; |
360 | cap &= ~IEEE80211_HT_CAP_SGI_40; | 360 | cap &= ~IEEE80211_HT_CAP_SGI_40; |
361 | } | 361 | } |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index d897528ee7fc..48db569d4c6b 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, | |||
1226 | * to include that as well. | 1226 | * to include that as well. |
1227 | */ | 1227 | */ |
1228 | if (is_ht40_not_allowed(channel_before)) | 1228 | if (is_ht40_not_allowed(channel_before)) |
1229 | channel->flags |= IEEE80211_CHAN_NO_FAT_BELOW; | 1229 | channel->flags |= IEEE80211_CHAN_NO_HT40MINUS; |
1230 | else | 1230 | else |
1231 | channel->flags &= ~IEEE80211_CHAN_NO_FAT_BELOW; | 1231 | channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS; |
1232 | 1232 | ||
1233 | if (is_ht40_not_allowed(channel_after)) | 1233 | if (is_ht40_not_allowed(channel_after)) |
1234 | channel->flags |= IEEE80211_CHAN_NO_FAT_ABOVE; | 1234 | channel->flags |= IEEE80211_CHAN_NO_HT40PLUS; |
1235 | else | 1235 | else |
1236 | channel->flags &= ~IEEE80211_CHAN_NO_FAT_ABOVE; | 1236 | channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS; |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | static void reg_process_ht_flags_band(struct wiphy *wiphy, | 1239 | static void reg_process_ht_flags_band(struct wiphy *wiphy, |