Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

[sfrench/cifs-2.6.git] / net / mac80211 / util.c

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 7e0dd4be80970bff8b1fffe23755a34dc1330bab..6886601afe1c731c3cc7b5409745307b2f48e67c 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1817,7 +1817,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.