From bd00abc794eec8922ec87d1db0d64c1129eb8099 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 31 Oct 2009 07:44:08 +0100
Subject: [PATCH] --- yaml --- r: 171372 b: refs/heads/master c:
 6d3560d4fc9c5b9fe1a07a63926ea70512c69c32 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/scan.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index effe34dc89d0..e6eee0de874a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1933ac4d9377ed44caba45abe1531ec1bc14bb63
+refs/heads/master: 6d3560d4fc9c5b9fe1a07a63926ea70512c69c32
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index c46ac01e2a8f..88a9a1be314a 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -288,10 +288,14 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
 
 	mutex_lock(&local->scan_mtx);
 
-	if (WARN_ON(!local->scanning)) {
-		mutex_unlock(&local->scan_mtx);
-		return;
-	}
+	/*
+	 * It's ok to abort a not-yet-running scan (that
+	 * we have one at all will be verified by checking
+	 * local->scan_req next), but not to complete it
+	 * successfully.
+	 */
+	if (WARN_ON(!local->scanning && !aborted))
+		aborted = true;
 
 	if (WARN_ON(!local->scan_req)) {
 		mutex_unlock(&local->scan_mtx);