From 2d974e99136b36c742368551e11c968ef70c296f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 20 Feb 2012 14:19:58 +0100
Subject: [PATCH] --- yaml --- r: 290701 b: refs/heads/master c:
 79ebfb85d4ad3495d70124a249a1096ab6396c05 h: refs/heads/master i:   290699:
 4d50964c3b68d02ecf2c52265228c86d80cd0364 v: v3

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

diff --git a/[refs] b/[refs]
index 4ff416f20c5b..2232c1f9bf71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d26ad3771fe7405bf80d736cae9ba4c706a7b1d8
+refs/heads/master: 79ebfb85d4ad3495d70124a249a1096ab6396c05
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 586d4fb8e130..1495fb99b379 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2238,14 +2238,28 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 	} else {
 		printk(KERN_DEBUG "%s: associated\n", sdata->name);
 
-		ieee80211_destroy_assoc_data(sdata, true);
+		/* tell driver about sync done first */
+		if (assoc_data->synced) {
+			drv_finish_tx_sync(sdata->local, sdata,
+					   assoc_data->bss->bssid,
+					   IEEE80211_TX_SYNC_ASSOC);
+			assoc_data->synced = false;
+		}
 
 		if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
 			/* oops -- internal error -- send timeout for now */
+			ieee80211_destroy_assoc_data(sdata, true);
 			sta_info_destroy_addr(sdata, mgmt->bssid);
 			cfg80211_put_bss(*bss);
 			return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
 		}
+
+		/*
+		 * destroy assoc_data afterwards, as otherwise an idle
+		 * recalc after assoc_data is NULL but before associated
+		 * is set can cause the interface to go idle
+		 */
+		ieee80211_destroy_assoc_data(sdata, true);
 	}
 
 	return RX_MGMT_CFG80211_RX_ASSOC;