aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/ht.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-01-07 10:13:27 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:55 -0500
commit4797938c5dfa22af30fd16679192972f878419a1 (patch)
tree5e9de4801903f0e8fd5aac75c26295ed0069667a /net/mac80211/ht.c
parent47166791b7296db5c0a7189401e42b8c7f4cca25 (diff)
mac80211: clean up channel type config
The channel_type really doesn't need to be the only member in a new structure, so remove the struct. Additionally, remove the _CONF_CHANGE_HT flag and use _CONF_CHANGE_CHANNEL when the channel type changes, since that's enough of a change to require reprogramming the hardware anyway. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ht.c')
-rw-r--r--net/mac80211/ht.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index f6547de5ac6..832adf888ac 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -131,12 +131,14 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
}
ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||
- channel_type != local->hw.conf.ht.channel_type;
+ channel_type != local->hw.conf.channel_type;
local->oper_channel_type = channel_type;
- if (ht_changed)
- ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT);
+ if (ht_changed) {
+ /* channel_type change automatically detected */
+ ieee80211_hw_config(local, 0);
+ }
/* disable HT */
if (!enable_ht)