---

yaml --- r: 311379 b: refs/heads/master c: 79543d8 h: refs/heads/master i: 311377: 75d8448 311375: a2caaf2 v: v3
git-mirror · Jun 13, 2012 · 9a7cb76 · 9a7cb76
1 parent e1e7819
commit 9a7cb76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 554a43d5e77e8256aa9685ffd19ad555e6f77979
+refs/heads/master: 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -1352,6 +1352,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	if (WARN_ON(!ifmgd->associated))
 		return;
 
+	ieee80211_stop_poll(sdata);
+
 	memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
 
 	ifmgd->associated = NULL;
@@ -2612,8 +2614,6 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 	u8 frame_buf[DEAUTH_DISASSOC_LEN];
 
-	ieee80211_stop_poll(sdata);
-
 	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
 			       false, frame_buf);
 	mutex_unlock(&ifmgd->mtx);