summaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-17 15:52:17 +0000
committerMark Brown <broonie@linaro.org>2014-01-17 15:52:17 +0000
commit81e53d0470878165a300d75ac06a5bc5eee543a2 (patch)
tree5fdaacfb350c5a290109f98ab29e9858f1f11469 /net/mac80211/scan.c
parent15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff)
parentfcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff)
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 5ad66a83ef7..bcc4833d754 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);