diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-09-13 14:46:42 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-14 16:14:25 -0400 |
| commit | edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5 (patch) | |
| tree | 6f788ac16b25e1ab065b5e01fe27676b8aecb9c7 /net | |
| parent | e7e16b90b477a07d17af37dceb2e8af1ddbd9712 (diff) | |
| download | blackbird-op-linux-edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5.tar.gz blackbird-op-linux-edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index a06b6ee63c07..7fb114856977 100644 --- 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__); |
