From dd116d76f7192f2c567767f8d743c921fcdbcb94 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Mon, 13 Sep 2010 14:46:42 +0200
Subject: [PATCH] --- yaml --- r: 214658 b: refs/heads/master c:
 edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d9ef57217612..5924b7783b8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7e16b90b477a07d17af37dceb2e8af1ddbd9712
+refs/heads/master: edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index a06b6ee63c07..7fb114856977 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -305,6 +305,9 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw)
 
 	trace_api_restart_hw(local);
 
+	/* wait for scan work complete */
+	flush_workqueue(local->workqueue);
+
 	WARN(test_bit(SCAN_HW_SCANNING, &local->scanning),
 		"%s called with hardware scan in progress\n", __func__);