From ad0c94db736e30d3103bc1b4a188d1e0ea905e91 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Tue, 23 Dec 2008 15:58:45 -0800
Subject: [PATCH] --- yaml --- r: 134049 b: refs/heads/master c:
 285256a59d790c6a9afe8ec82804a369d956ac06 h: refs/heads/master i:   134047:
 17c140ffb3cb558de05928c25c8438969bd1a19b v: v3

---
 [refs]                       |  2 +-
 trunk/include/net/mac80211.h |  1 -
 trunk/net/mac80211/ht.c      |  3 +--
 trunk/net/mac80211/main.c    | 10 ----------
 trunk/net/mac80211/mlme.c    |  1 -
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index bf847c2e47a6..7cfab4dc542a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de27e64e5eb72ff3edcaf5edce2f306ada1f094d
+refs/heads/master: 285256a59d790c6a9afe8ec82804a369d956ac06
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 1e8db8ae6159..9d67fdf1c26a 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -508,7 +508,6 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
 #define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())
 
 struct ieee80211_ht_conf {
-	bool enabled;
 	enum nl80211_channel_type channel_type;
 };
 
diff --git a/trunk/net/mac80211/ht.c b/trunk/net/mac80211/ht.c
index c5c0c5271096..f6547de5ac6b 100644
--- a/trunk/net/mac80211/ht.c
+++ b/trunk/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);
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 24b14363d6e7..a6cb480dda0d 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -211,16 +211,6 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 	    channel_type != local->hw.conf.ht.channel_type) {
 		local->hw.conf.channel = chan;
 		local->hw.conf.ht.channel_type = channel_type;
-		switch (channel_type) {
-		case NL80211_CHAN_NO_HT:
-			local->hw.conf.ht.enabled = false;
-			break;
-		case NL80211_CHAN_HT20:
-		case NL80211_CHAN_HT40MINUS:
-		case NL80211_CHAN_HT40PLUS:
-			local->hw.conf.ht.enabled = true;
-			break;
-		}
 		changed |= IEEE80211_CONF_CHANGE_CHANNEL;
 	}
 
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 599a42172a16..12976026cc45 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -901,7 +901,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 
 	rcu_read_unlock();
 
-	local->hw.conf.ht.enabled = false;
 	local->oper_channel_type = NL80211_CHAN_NO_HT;
 	config_changed |= IEEE80211_CONF_CHANGE_HT;