diff options
author | John W. Linville | 2013-12-05 15:29:56 +0100 |
---|---|---|
committer | John W. Linville | 2013-12-05 15:29:56 +0100 |
commit | aa489f0f268595bd33d9649030bd1a43c28927a0 (patch) | |
tree | 598cb96d4b22749e07116cb4006d71fb5a5704ea /net/mac80211/scan.c | |
parent | Merge branch 'cxgb4' (diff) | |
parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
download | kernel-qcow2-linux-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.gz kernel-qcow2-linux-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.xz kernel-qcow2-linux-aa489f0f268595bd33d9649030bd1a43c28927a0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r-- | net/mac80211/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 5ad66a83ef7f..bcc4833d7542 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -1088,6 +1088,6 @@ void ieee80211_sched_scan_stopped(struct ieee80211_hw *hw) trace_api_sched_scan_stopped(local); - ieee80211_queue_work(&local->hw, &local->sched_scan_stopped_work); + schedule_work(&local->sched_scan_stopped_work); } EXPORT_SYMBOL(ieee80211_sched_scan_stopped); |