---

yaml --- r: 214658 b: refs/heads/master c: edeb78a h: refs/heads/master v: v3
git-mirror · Sep 14, 2010 · dd116d7 · dd116d7
1 parent f1c8130
commit dd116d7
Show file tree

Hide file tree

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