3 files changed, 10 insertions, 12 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 5b8b4460b69f..35b07ea0633a 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1154,10 +1154,6 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
                 return -EINVAL;
         }
 
-        /* enable WMM or activate new settings */
-        local->hw.conf.flags |= IEEE80211_CONF_QOS;
-        drv_config(local, IEEE80211_CONF_CHANGE_QOS);
-
         return 0;
 }
 
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d1962650b254..7a4e4bffbc71 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -698,10 +698,11 @@ void ieee80211_dynamic_ps_timer(unsigned long data)
 
 /* MLME */
 static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
-                                     struct ieee80211_if_managed *ifmgd,
+                                     struct ieee80211_sub_if_data *sdata,
                                      u8 *wmm_param, size_t wmm_param_len)
 {
         struct ieee80211_tx_queue_params params;
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
         size_t left;
         int count;
         u8 *pos, uapsd_queues = 0;
@@ -790,8 +791,8 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
         }
 
         /* enable WMM or activate new settings */
-        local->hw.conf.flags |= IEEE80211_CONF_QOS;
-        drv_config(local, IEEE80211_CONF_CHANGE_QOS);
+        sdata->vif.bss_conf.qos = true;
+        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);
 }
 
 static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
@@ -1325,7 +1326,7 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
         }
 
         if (elems.wmm_param)
-                ieee80211_sta_wmm_params(local, ifmgd, elems.wmm_param,
+                ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
                                          elems.wmm_param_len);
         else
                 ieee80211_set_wmm_default(sdata);
@@ -1597,7 +1598,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                 ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems,
                                       true);
 
-                ieee80211_sta_wmm_params(local, ifmgd, elems.wmm_param,
+                ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
                                          elems.wmm_param_len);
         }
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index a54cf146ed50..794792177376 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -803,8 +803,8 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
 
         /* after reinitialize QoS TX queues setting to default,
          * disable QoS at all */
-        local->hw.conf.flags &= ~IEEE80211_CONF_QOS;
-        drv_config(local, IEEE80211_CONF_CHANGE_QOS);
+        sdata->vif.bss_conf.qos = sdata->vif.type != NL80211_IFTYPE_STATION;
+        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);
 }
 
 void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
@@ -1161,7 +1161,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                           BSS_CHANGED_BASIC_RATES |
                           BSS_CHANGED_BEACON_INT |
                           BSS_CHANGED_BSSID |
-                          BSS_CHANGED_CQM;
+                          BSS_CHANGED_CQM |
+                          BSS_CHANGED_QOS;
 
                 switch (sdata->vif.type) {
                 case NL80211_IFTYPE_STATION: