From 6de4892cb536131278ee676d402aa670013e8354 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 1 Dec 2008 14:56:41 -0500
Subject: [PATCH] --- yaml --- r: 122466 b: refs/heads/master c:
 e327b847e67051ece8d121f9aebeb4d736c36a02 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d08ccfb8e261..848efdfa6e7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04adf890667050b83a58abaf63610e53a604261b
+refs/heads/master: e327b847e67051ece8d121f9aebeb4d736c36a02
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 46082125f3e1..9ab772ac74ae 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -435,7 +435,11 @@ static int ieee80211_stop(struct net_device *dev)
 		break;
 	case NL80211_IFTYPE_STATION:
 	case NL80211_IFTYPE_ADHOC:
-		sdata->u.sta.state = IEEE80211_STA_MLME_DISABLED;
+		/* Announce that we are leaving the network. */
+		if (sdata->u.sta.state != IEEE80211_STA_MLME_DISABLED)
+			ieee80211_sta_deauthenticate(sdata,
+						WLAN_REASON_DEAUTH_LEAVING);
+
 		memset(sdata->u.sta.bssid, 0, ETH_ALEN);
 		del_timer_sync(&sdata->u.sta.timer);
 		/*