---

yaml --- r: 159279 b: refs/heads/master c: f9d6b40 h: refs/heads/master i: 159277: c146636 159275: a2702a8 159271: 16163cf 159263: e9b0d19 v: v3
git-mirror · Jul 29, 2009 · c4e1607 · c4e1607
1 parent 0c0b84c
commit c4e1607
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;