From c4e1607c8a025bf757e39c01ed3b324e402aff90 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 27 Jul 2009 10:22:28 +0200
Subject: [PATCH] --- yaml --- r: 159279 b: refs/heads/master c:
 f9d6b402603a63b5e5b56bd7a79fa72a818be55b h: refs/heads/master i:   159277:
 c1466366c1b09fb6c77ffbc330255a4f33bf149c   159275:
 a2702a84f52180120a8381b83a11009bd5ff1e3e   159271:
 16163cf64b5f9c73871a39fcc29b9b64c293a4a2   159263:
 e9b0d190f4de82cf80dbc7708389ce07e96cc7bc v: v3

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

diff --git a/[refs] b/[refs]
index c0d84302628d..966bf7168468 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fec247c0d5bfbaa0861774ce31d515bbd48f7fce
+refs/heads/master: f9d6b402603a63b5e5b56bd7a79fa72a818be55b
diff --git a/trunk/net/wireless/mlme.c b/trunk/net/wireless/mlme.c
index 5b9b22120824..30058a80d7af 100644
--- a/trunk/net/wireless/mlme.c
+++ b/trunk/net/wireless/mlme.c
@@ -545,6 +545,12 @@ static int __cfg80211_mlme_disassoc(struct cfg80211_registered_device *rdev,
 
 	ASSERT_WDEV_LOCK(wdev);
 
+	if (wdev->sme_state != CFG80211_SME_CONNECTED)
+		return -ENOTCONN;
+
+	if (WARN_ON(!wdev->current_bss))
+		return -ENOTCONN;
+
 	memset(&req, 0, sizeof(req));
 	req.reason_code = reason;
 	req.ie = ie;