summaryrefslogtreecommitdiff
path: root/net/mac80211/ht.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-12-23 15:58:45 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:32 -0500
commit285256a59d790c6a9afe8ec82804a369d956ac06 (patch)
tree679c78347f255f3a1e198c2cbba98463a99185e5 /net/mac80211/ht.c
parentde27e64e5eb72ff3edcaf5edce2f306ada1f094d (diff)
mac80211: no need for ht.enabled
We can simply use conf_is_ht() check where needed. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Acked-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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index c5c0c5271096..f6547de5ac6b 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -130,11 +130,10 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
}
}
- ht_changed = local->hw.conf.ht.enabled != enable_ht ||
+ ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||
channel_type != local->hw.conf.ht.channel_type;
local->oper_channel_type = channel_type;
- local->hw.conf.ht.enabled = enable_ht;
if (ht_changed)
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT);