From de9f88cc85f5825ee02a72611145211595c8de3c Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Fri, 18 Feb 2011 09:05:08 +0100
Subject: [PATCH] --- yaml --- r: 233617 b: refs/heads/master c:
 05e7c99136554789e4cc060a63334ccaa08ad62d h: refs/heads/master i:   233615:
 c0354e5aa35293bdbe3b8296a5b343ca21bd7adf v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c28bf5fb58b6..40f46e0082b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b68e676204927f69e987b86a99e19e61cc37dcc
+refs/heads/master: 05e7c99136554789e4cc060a63334ccaa08ad62d
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 45fbb9e33746..c9ceb4d57ab0 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1033,6 +1033,12 @@ void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
 	if (is_multicast_ether_addr(hdr->addr1))
 		return;
 
+	/*
+	 * In case we receive frames after disassociation.
+	 */
+	if (!sdata->u.mgd.associated)
+		return;
+
 	ieee80211_sta_reset_conn_monitor(sdata);
 }