mac80211: set QoS capability before changing station state

In the upcoming fast-xmit patch, changing station state will
build a header cache based on the station's capabilities, and
as the QoS capability (sta.wme) impacts the header, it needs
to be set before.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 301215be59ef..e4dd2fc34de3 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1059,6 +1059,10 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                 }
         }
 
+        if (mask & BIT(NL80211_STA_FLAG_WME) &&
+            local->hw.queues >= IEEE80211_NUM_ACS)
+                sta->sta.wme = set & BIT(NL80211_STA_FLAG_WME);
+
         /* auth flags will be set later for TDLS stations */
         if (!test_sta_flag(sta, WLAN_STA_TDLS_PEER)) {
                 ret = sta_apply_auth_flags(local, sta, mask, set);
@@ -1073,10 +1077,6 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                         clear_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE);
         }
 
-        if (mask & BIT(NL80211_STA_FLAG_WME) &&
-            local->hw.queues >= IEEE80211_NUM_ACS)
-                sta->sta.wme = set & BIT(NL80211_STA_FLAG_WME);
-
         if (mask & BIT(NL80211_STA_FLAG_MFP)) {
                 sta->sta.mfp = !!(set & BIT(NL80211_STA_FLAG_MFP));
                 if (set & BIT(NL80211_STA_FLAG_MFP))