1 files changed, 37 insertions, 38 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index c6f81ecc36a1..52136fd5ba97 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -95,42 +95,47 @@ static void ieee80211_reconfig_filter(struct work_struct *work)
 static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
-        struct ieee80211_channel *chan;
+        struct cfg80211_chan_def chandef = {};
         u32 changed = 0;
         int power;
-        enum nl80211_channel_type channel_type;
         u32 offchannel_flag;
 
         offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
+
         if (local->scan_channel) {
-                chan = local->scan_channel;
+                chandef.chan = local->scan_channel;
                 /* If scanning on oper channel, use whatever channel-type
                  * is currently in use.
                  */
-                if (chan == local->_oper_channel)
-                        channel_type = local->_oper_channel_type;
-                else
-                        channel_type = NL80211_CHAN_NO_HT;
+                if (chandef.chan == local->_oper_chandef.chan) {
+                        chandef = local->_oper_chandef;
+                } else {
+                        chandef.width = NL80211_CHAN_WIDTH_20_NOHT;
+                        chandef.center_freq1 = chandef.chan->center_freq;
+                }
         } else if (local->tmp_channel) {
-                chan = local->tmp_channel;
-                channel_type = NL80211_CHAN_NO_HT;
-        } else {
-                chan = local->_oper_channel;
-                channel_type = local->_oper_channel_type;
-        }
-
-        if (chan != local->_oper_channel ||
-            channel_type != local->_oper_channel_type)
+                chandef.chan = local->tmp_channel;
+                chandef.width = NL80211_CHAN_WIDTH_20_NOHT;
+                chandef.center_freq1 = chandef.chan->center_freq;
+        } else
+                chandef = local->_oper_chandef;
+
+        WARN(!cfg80211_chandef_valid(&chandef),
+             "control:%d MHz width:%d center: %d/%d MHz",
+             chandef.chan->center_freq, chandef.width,
+             chandef.center_freq1, chandef.center_freq2);
+
+        if (!cfg80211_chandef_identical(&chandef, &local->_oper_chandef))
                 local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;
         else
                 local->hw.conf.flags &= ~IEEE80211_CONF_OFFCHANNEL;
 
         offchannel_flag ^= local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
 
-        if (offchannel_flag || chan != local->hw.conf.channel ||
-            channel_type != local->hw.conf.channel_type) {
-                local->hw.conf.channel = chan;
-                local->hw.conf.channel_type = channel_type;
+        if (offchannel_flag ||
+            !cfg80211_chandef_identical(&local->hw.conf.chandef,
+                                        &local->_oper_chandef)) {
+                local->hw.conf.chandef = chandef;
                 changed |= IEEE80211_CONF_CHANGE_CHANNEL;
         }
 
@@ -146,7 +151,7 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
                 changed |= IEEE80211_CONF_CHANGE_SMPS;
         }
 
-        power = chan->max_power;
+        power = chandef.chan->max_power;
 
         rcu_read_lock();
         list_for_each_entry_rcu(sdata, &local->interfaces, list) {
@@ -587,6 +592,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
                                          IEEE80211_RADIOTAP_MCS_HAVE_BW;
         local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
                                          IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
+        local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
+        local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
         local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
         wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
         wiphy->vht_capa_mod_mask = &mac80211_vht_capa_mod_mask;
@@ -738,11 +745,15 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                 sband = local->hw.wiphy->bands[band];
                 if (!sband)
                         continue;
-                if (!local->use_chanctx && !local->_oper_channel) {
+                if (!local->use_chanctx && !local->_oper_chandef.chan) {
                         /* init channel we're on */
-                        local->hw.conf.channel =
-                        local->_oper_channel = &sband->channels[0];
-                        local->hw.conf.channel_type = NL80211_CHAN_NO_HT;
+                        struct cfg80211_chan_def chandef = {
+                                .chan = &sband->channels[0],
+                                .width = NL80211_CHAN_NO_HT,
+                                .center_freq1 = sband->channels[0].center_freq,
+                                .center_freq2 = 0
+                        };
+                        local->hw.conf.chandef = local->_oper_chandef = chandef;
                 }
                 cfg80211_chandef_create(&local->monitor_chandef,
                                         &sband->channels[0],
@@ -829,22 +840,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         if (supp_ht)
                 local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap);
 
-        if (supp_vht) {
+        if (supp_vht)
                 local->scan_ies_len +=
                         2 + sizeof(struct ieee80211_vht_cap);
 
-                /*
-                 * (for now at least), drivers wanting to use VHT must
-                 * support channel contexts, as they contain all the
-                 * necessary VHT information and the global hw config
-                 * doesn't (yet)
-                 */
-                if (WARN_ON(!local->use_chanctx)) {
-                        result = -EINVAL;
-                        goto fail_wiphy_register;
-                }
-        }
-
         if (!local->ops->hw_scan) {
                 /* For hw_scan, driver needs to set these up. */
                 local->hw.wiphy->max_scan_ssids = 4;