From c743c8d4277f41cc29cd89c7c87dfc191e004973 Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Tue, 28 Sep 2010 14:39:32 +0300
Subject: [PATCH] --- yaml --- r: 214891 b: refs/heads/master c:
 f2176d7240e4f455a6e007703c7512fbde926dc8 h: refs/heads/master i:   214889:
 22d080da5e11ef5e296c78b65651648e108802ea   214887:
 9c61c9efc5119b06c7402345ebb671eea0d65fd2 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/mlme.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1affab654a5b..490a14e0ae9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b05238027420978d785569f8c1aa4a6867bc13
+refs/heads/master: f2176d7240e4f455a6e007703c7512fbde926dc8
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 8b733cf6f3ea..77913a15f537 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -880,14 +880,6 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 	sdata->u.mgd.flags &= ~(IEEE80211_STA_CONNECTION_POLL |
 				IEEE80211_STA_BEACON_POLL);
 
-	/*
-	 * Always handle WMM once after association regardless
-	 * of the first value the AP uses. Setting -1 here has
-	 * that effect because the AP values is an unsigned
-	 * 4-bit value.
-	 */
-	sdata->u.mgd.wmm_last_param_set = -1;
-
 	ieee80211_led_assoc(local, 1);
 
 	if (local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD)
@@ -1367,6 +1359,14 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
 		return false;
 	}
 
+	/*
+	 * Always handle WMM once after association regardless
+	 * of the first value the AP uses. Setting -1 here has
+	 * that effect because the AP values is an unsigned
+	 * 4-bit value.
+	 */
+	ifmgd->wmm_last_param_set = -1;
+
 	if (elems.wmm_param)
 		ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
 					 elems.wmm_param_len);