5 files changed, 11 insertions, 16 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 3b5874e0174f..337bb5d78003 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -356,7 +356,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         else
                 sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
 
-        ieee80211_set_wmm_default(sdata, true);
+        ieee80211_set_wmm_default(sdata, true, false);
 
         sdata->vif.bss_conf.ibss_joined = true;
         sdata->vif.bss_conf.ibss_creator = creator;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 5c76ba7aaf57..d832bd59236b 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1769,7 +1769,7 @@ int ieee80211_frame_duration(enum ieee80211_band band, size_t len,
                              int rate, int erp, int short_preamble,
                              int shift);
 void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
-                               bool bss_notify);
+                               bool bss_notify, bool enable_qos);
 void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
                     struct sta_info *sta, struct sk_buff *skb);
 
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f848c75518a2..d0dc1bfaeec2 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -661,11 +661,13 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
                 }
 
                 /*
-                 * set default queue parameters so drivers don't
+                 * Set default queue parameters so drivers don't
                  * need to initialise the hardware if the hardware
-                 * doesn't start up with sane defaults
+                 * doesn't start up with sane defaults.
+                 * Enable QoS for anything but station interfaces.
                  */
-                ieee80211_set_wmm_default(sdata, true);
+                ieee80211_set_wmm_default(sdata, true,
+                        sdata->vif.type != NL80211_IFTYPE_STATION);
         }
 
         set_bit(SDATA_STATE_RUNNING, &sdata->state);
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 73f1a2a0df5a..67f0387bea27 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2077,7 +2077,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         ieee80211_bss_info_change_notify(sdata, changed);
 
         /* disassociated - set to defaults now */
-        ieee80211_set_wmm_default(sdata, false);
+        ieee80211_set_wmm_default(sdata, false, false);
 
         del_timer_sync(&sdata->u.mgd.conn_mon_timer);
         del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
@@ -3048,7 +3048,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                 ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
                                          elems.wmm_param_len);
         else
-                ieee80211_set_wmm_default(sdata, false);
+                ieee80211_set_wmm_default(sdata, false, false);
         changed |= BSS_CHANGED_QOS;
 
         /* set AID and assoc capability,
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 8802aa4da2a4..74058020b7d6 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1105,13 +1105,13 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
 }
 
 void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
-                               bool bss_notify)
+                               bool bss_notify, bool enable_qos)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_tx_queue_params qparam;
         struct ieee80211_chanctx_conf *chanctx_conf;
         int ac;
-        bool use_11b, enable_qos;
+        bool use_11b;
         bool is_ocb; /* Use another EDCA parameters if dot11OCBActivated=true */
         int aCWmin, aCWmax;
 
@@ -1130,13 +1130,6 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
                  !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);
         rcu_read_unlock();
 
-        /*
-         * By default disable QoS in STA mode for old access points, which do
-         * not support 802.11e. New APs will provide proper queue parameters,
-         * that we will configure later.
-         */
-        enable_qos = (sdata->vif.type != NL80211_IFTYPE_STATION);
-
         is_ocb = (sdata->vif.type == NL80211_IFTYPE_OCB);
 
         /* Set defaults according to 802.11-2007 Table 7-37 */