commit edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5
author Stanislaw Gruszka <sgruszka@redhat.com> Mon Sep 13 14:46:42 2010 +0200
committer John W. Linville <linville@tuxdriver.com> Tue Sep 14 16:14:25 2010 -0400
tree 6f788ac16b25e1ab065b5e01fe27676b8aecb9c7
parent e7e16b90b477a07d17af37dceb2e8af1ddbd9712

mac80211: wait for scan work complete before restarting hw

This is needed to avoid warning in ieee80211_restart_hw about hardware
scan in progress.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a06b6ee..7fb1148 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -305,6 +305,9 @@
 
 	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__);