7 files changed, 52 insertions, 46 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 23b5eeaf7bc5..3ea0884c9432 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1122,12 +1122,12 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
 
 static int ieee80211_set_channel(struct wiphy *wiphy,
                                  struct ieee80211_channel *chan,
-                                 enum nl80211_sec_chan_offset sec_chan_offset)
+                                 enum nl80211_channel_type channel_type)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
 
         local->oper_channel = chan;
-        local->oper_sec_chan_offset = sec_chan_offset;
+        local->oper_channel_type = channel_type;
 
         return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 }
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index a1eed7032c9b..5f510a13b9f0 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -98,6 +98,7 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_bss_ht_conf ht;
         u32 changed = 0;
         bool enable_ht = true, ht_changed;
+        enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
 
         sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
 
@@ -112,24 +113,36 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
             ieee80211_channel_to_frequency(hti->control_chan))
                 enable_ht = false;
 
-        /*
-         * XXX: This is totally incorrect when there are multiple virtual
-         *      interfaces, needs to be fixed later.
-         */
-        ht_changed = local->hw.conf.ht.enabled != enable_ht;
+        if (enable_ht) {
+                channel_type = NL80211_CHAN_HT20;
+
+                if (!(ap_ht_cap_flags & IEEE80211_HT_CAP_40MHZ_INTOLERANT) &&
+                    (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&
+                    (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)) {
+                        switch(hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
+                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+                                channel_type = NL80211_CHAN_HT40PLUS;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+                                channel_type = NL80211_CHAN_HT40MINUS;
+                                break;
+                        }
+                }
+        }
+
+        ht_changed = local->hw.conf.ht.enabled != 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);
 
         /* disable HT */
         if (!enable_ht)
                 return 0;
-        ht.secondary_channel_offset =
-                hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET;
-        ht.width_40_ok =
-                !(ap_ht_cap_flags & IEEE80211_HT_CAP_40MHZ_INTOLERANT) &&
-                (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&
-                (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY);
+
         ht.operation_mode = le16_to_cpu(hti->operation_mode);
 
         /* if bss configuration changed store the new one */
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 6f59e11d7b33..a7dabaecfc72 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -625,7 +625,7 @@ struct ieee80211_local {
         struct delayed_work scan_work;
         struct ieee80211_sub_if_data *scan_sdata;
         struct ieee80211_channel *oper_channel, *scan_channel;
-        enum nl80211_sec_chan_offset oper_sec_chan_offset;
+        enum nl80211_channel_type oper_channel_type;
         u8 scan_ssid[IEEE80211_MAX_SSID_LEN];
         size_t scan_ssid_len;
         struct list_head bss_list;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6d8710327d14..a0371caf01ce 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -195,37 +195,30 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
         struct ieee80211_channel *chan;
         int ret = 0;
         int power;
-        enum nl80211_sec_chan_offset sec_chan_offset;
+        enum nl80211_channel_type channel_type;
 
         might_sleep();
 
         if (local->sw_scanning) {
                 chan = local->scan_channel;
-                sec_chan_offset = NL80211_SEC_CHAN_NO_HT;
+                channel_type = NL80211_CHAN_NO_HT;
         } else {
                 chan = local->oper_channel;
-                sec_chan_offset = local->oper_sec_chan_offset;
+                channel_type = local->oper_channel_type;
         }
 
         if (chan != local->hw.conf.channel ||
-            sec_chan_offset != local->hw.conf.ht.sec_chan_offset) {
+            channel_type != local->hw.conf.ht.channel_type) {
                 local->hw.conf.channel = chan;
-                switch (sec_chan_offset) {
-                case NL80211_SEC_CHAN_NO_HT:
+                local->hw.conf.ht.channel_type = channel_type;
+                switch (channel_type) {
+                case NL80211_CHAN_NO_HT:
                         local->hw.conf.ht.enabled = false;
-                        local->hw.conf.ht.sec_chan_offset = 0;
                         break;
-                case NL80211_SEC_CHAN_DISABLED:
+                case NL80211_CHAN_HT20:
+                case NL80211_CHAN_HT40MINUS:
+                case NL80211_CHAN_HT40PLUS:
                         local->hw.conf.ht.enabled = true;
-                        local->hw.conf.ht.sec_chan_offset = 0;
-                        break;
-                case NL80211_SEC_CHAN_BELOW:
-                        local->hw.conf.ht.enabled = true;
-                        local->hw.conf.ht.sec_chan_offset = -1;
-                        break;
-                case NL80211_SEC_CHAN_ABOVE:
-                        local->hw.conf.ht.enabled = true;
-                        local->hw.conf.ht.sec_chan_offset = 1;
                         break;
                 }
                 changed |= IEEE80211_CONF_CHANGE_CHANNEL;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 290b0017ef2e..e4d1fca5c72d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -858,6 +858,7 @@ 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;
         ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT);
 
         ieee80211_bss_info_change_notify(sdata, changed);
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 505d68f344ce..71a8391c54f6 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -641,7 +641,7 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
                     chan->flags & IEEE80211_CHAN_NO_IBSS)
                         return ret;
                 local->oper_channel = chan;
-                local->oper_sec_chan_offset = NL80211_SEC_CHAN_NO_HT;
+                local->oper_channel_type = NL80211_CHAN_NO_HT;
 
                 if (local->sw_scanning || local->hw_scanning)
                         ret = 0;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 93c9b983ce08..1e728fff474e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -60,7 +60,7 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = {
                                       .len = BUS_ID_SIZE-1 },
         [NL80211_ATTR_WIPHY_TXQ_PARAMS] = { .type = NLA_NESTED },
         [NL80211_ATTR_WIPHY_FREQ] = { .type = NLA_U32 },
-        [NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET] = { .type = NLA_U32 },
+        [NL80211_ATTR_WIPHY_CHANNEL_TYPE] = { .type = NLA_U32 },
 
         [NL80211_ATTR_IFTYPE] = { .type = NLA_U32 },
         [NL80211_ATTR_IFINDEX] = { .type = NLA_U32 },
@@ -362,8 +362,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
         }
 
         if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
-                enum nl80211_sec_chan_offset sec_chan_offset =
-                        NL80211_SEC_CHAN_NO_HT;
+                enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
                 struct ieee80211_channel *chan;
                 struct ieee80211_sta_ht_cap *ht_cap;
                 u32 freq, sec_freq;
@@ -375,13 +374,13 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 
                 result = -EINVAL;
 
-                if (info->attrs[NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET]) {
-                        sec_chan_offset = nla_get_u32(info->attrs[
-                                        NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET]);
-                        if (sec_chan_offset != NL80211_SEC_CHAN_NO_HT &&
-                            sec_chan_offset != NL80211_SEC_CHAN_DISABLED &&
-                            sec_chan_offset != NL80211_SEC_CHAN_BELOW &&
-                            sec_chan_offset != NL80211_SEC_CHAN_ABOVE)
+                if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
+                        channel_type = nla_get_u32(info->attrs[
+                                           NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
+                        if (channel_type != NL80211_CHAN_NO_HT &&
+                            channel_type != NL80211_CHAN_HT20 &&
+                            channel_type != NL80211_CHAN_HT40PLUS &&
+                            channel_type != NL80211_CHAN_HT40MINUS)
                                 goto bad_res;
                 }
 
@@ -392,9 +391,9 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                 if (!chan || chan->flags & IEEE80211_CHAN_DISABLED)
                         goto bad_res;
 
-                if (sec_chan_offset == NL80211_SEC_CHAN_BELOW)
+                if (channel_type == NL80211_CHAN_HT40MINUS)
                         sec_freq = freq - 20;
-                else if (sec_chan_offset == NL80211_SEC_CHAN_ABOVE)
+                else if (channel_type == NL80211_CHAN_HT40PLUS)
                         sec_freq = freq + 20;
                 else
                         sec_freq = 0;
@@ -402,7 +401,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                 ht_cap = &rdev->wiphy.bands[chan->band]->ht_cap;
 
                 /* no HT capabilities */
-                if (sec_chan_offset != NL80211_SEC_CHAN_NO_HT &&
+                if (channel_type != NL80211_CHAN_NO_HT &&
                     !ht_cap->ht_supported)
                         goto bad_res;
 
@@ -422,7 +421,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                 }
 
                 result = rdev->ops->set_channel(&rdev->wiphy, chan,
-                                                sec_chan_offset);
+                                                channel_type);
                 if (result)
                         goto bad_res;
         }