summaryrefslogtreecommitdiff
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-13 23:27:44 +0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-13 23:27:44 +0400
commit3231d65ffe36e177caf5006d4079867d9b7b2d4a (patch)
tree375c625573387973b4d03ca80eaed2477490fc8b /net/mac80211/util.c
parent0d770a82ad8a46b12d706cf11cd11e274fe92302 (diff)
parent209f6c37540a6cc1c74333a7ede0da729488a8cd (diff)
downloadlinux-3231d65ffe36e177caf5006d4079867d9b7b2d4a.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index ad058759e85e..c08bd4aca6bb 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1777,7 +1777,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
mutex_unlock(&local->mtx);
if (sched_scan_stopped)
- cfg80211_sched_scan_stopped(local->hw.wiphy);
+ cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);
/*
* If this is for hw restart things are still running.