4 files changed, 1 insertions, 14 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 1e8db8ae615..9d67fdf1c26 100644
--- a/include/net/mac80211.h
+++ b/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/net/mac80211/ht.c b/net/mac80211/ht.c
index c5c0c527109..f6547de5ac6 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);
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 24b14363d6e..a6cb480dda0 100644
--- a/net/mac80211/main.c
+++ b/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/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 599a42172a1..12976026cc4 100644
--- a/net/mac80211/mlme.c
+++ b/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;