diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-13 15:27:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-13 15:27:44 -0400 |
| commit | 3231d65ffe36e177caf5006d4079867d9b7b2d4a (patch) | |
| tree | 375c625573387973b4d03ca80eaed2477490fc8b /net/wireless | |
| parent | 0d770a82ad8a46b12d706cf11cd11e274fe92302 (diff) | |
| parent | 209f6c37540a6cc1c74333a7ede0da729488a8cd (diff) | |
| download | linux-3231d65ffe36e177caf5006d4079867d9b7b2d4a.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/scan.c | 12 | ||||
| -rw-r--r-- | net/wireless/sme.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 0f5da18cc619..e7329bb6a323 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_rdev(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); diff --git a/net/wireless/sme.c b/net/wireless/sme.c index e2923a3f2e5c..0c0844b585d1 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -234,7 +234,6 @@ void cfg80211_conn_work(struct work_struct *work) NULL, 0, NULL, 0, WLAN_STATUS_UNSPECIFIED_FAILURE, false, NULL); - cfg80211_sme_free(wdev); } wdev_unlock(wdev); } @@ -647,6 +646,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, cfg80211_unhold_bss(bss_from_pub(bss)); cfg80211_put_bss(wdev->wiphy, bss); } + cfg80211_sme_free(wdev); return; } |