summaryrefslogtreecommitdiff
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-12-06 09:50:45 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-12-06 09:50:45 -0500
commite08fd975bf26aa8063cadd245817e042f570472d (patch)
tree2b2a705710e6374cc037f89bcc7bfc25047485ba /net/mac80211/scan.c
parent251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f (diff)
parenta59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff)
downloadlwn-e08fd975bf26aa8063cadd245817e042f570472d.tar.gz
lwn-e08fd975bf26aa8063cadd245817e042f570472d.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/brcm80211/Kconfig net/mac80211/util.c
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 c22cbb57b49d..4d73c46df862 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);