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/wireless/scan.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/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7d09a712cb1..88f108edfb5 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -284,14 +284,22 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy) } EXPORT_SYMBOL(cfg80211_sched_scan_results); -void cfg80211_sched_scan_stopped(struct wiphy *wiphy) +void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy) { struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); + ASSERT_RTNL(); + trace_cfg80211_sched_scan_stopped(wiphy); - rtnl_lock(); __cfg80211_stop_sched_scan(rdev, true); +} +EXPORT_SYMBOL(cfg80211_sched_scan_stopped_rtnl); + +void cfg80211_sched_scan_stopped(struct wiphy *wiphy) +{ + rtnl_lock(); + cfg80211_sched_scan_stopped_rtnl(wiphy); rtnl_unlock(); } EXPORT_SYMBOL(cfg80211_sched_scan_stopped); |