diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-29 13:28:14 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-29 13:28:14 +0200 |
| commit | f70977fbd6359efb17bb93adac37b9f226d910a7 (patch) | |
| tree | d36c3ace7ae638ec447b7cce39617d950d121265 /net/wireless/scan.c | |
| parent | 2807bd18cc60ec471917b5158e98e4d7b7e030fb (diff) | |
| parent | e6f8a4d60b905eae1a20cbb0c72c67b26b2f02fd (diff) | |
Merge back earlier ACPI thermal material.
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 7d09a712cb1f..88f108edfb58 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); |