diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:13:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:13:41 -0400 |
| commit | 6153871f77f8fa778cd0cf1e2979db75e25d3532 (patch) | |
| tree | c6024da3b1ee5ce379b3c60824aabba76a1e1799 /net/mac80211/util.c | |
| parent | 23a456f05353035d1a2b3f1b9a92707acdc036e0 (diff) | |
| parent | cabae81103584a8265114a543555781b7b0c88bd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 275c94f995f..3c365837e91 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1780,7 +1780,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. |