projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7e16b9
)
mac80211: wait for scan work complete before restarting hw
author
Stanislaw Gruszka
<sgruszka@redhat.com>
Mon, 13 Sep 2010 12:46:42 +0000
(14:46 +0200)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 14 Sep 2010 20:14:25 +0000
(16:14 -0400)
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
patch
|
blob
|
blame
|
history
diff --git
a/net/mac80211/main.c
b/net/mac80211/main.c
index a06b6ee63c07d7ac64f2440dba3fcf4b8fd40daa..7fb114856977f90f440f5b05ca6de4cff52e3449 100644
(file)
--- a/
net/mac80211/main.c
+++ b/
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__);