diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
| commit | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (patch) | |
| tree | b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3 /net/wireless/scan.c | |
| parent | ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| download | kernel_samsung_espresso10-4e111751cfcb75f26d2725eab934b6eb91a3d115.zip kernel_samsung_espresso10-4e111751cfcb75f26d2725eab934b6eb91a3d115.tar.gz kernel_samsung_espresso10-4e111751cfcb75f26d2725eab934b6eb91a3d115.tar.bz2 | |
Merge commit 'v3.0' into android-3.0
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7a6c676..ae0c225 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -100,14 +100,14 @@ void __cfg80211_sched_scan_results(struct work_struct *wk) rdev = container_of(wk, struct cfg80211_registered_device, sched_scan_results_wk); - cfg80211_lock_rdev(rdev); + mutex_lock(&rdev->sched_scan_mtx); /* we don't have sched_scan_req anymore if the scan is stopping */ if (rdev->sched_scan_req) nl80211_send_sched_scan_results(rdev, rdev->sched_scan_req->dev); - cfg80211_unlock_rdev(rdev); + mutex_unlock(&rdev->sched_scan_mtx); } void cfg80211_sched_scan_results(struct wiphy *wiphy) @@ -123,9 +123,9 @@ void cfg80211_sched_scan_stopped(struct wiphy *wiphy) { struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); - cfg80211_lock_rdev(rdev); + mutex_lock(&rdev->sched_scan_mtx); __cfg80211_stop_sched_scan(rdev, true); - cfg80211_unlock_rdev(rdev); + mutex_unlock(&rdev->sched_scan_mtx); } EXPORT_SYMBOL(cfg80211_sched_scan_stopped); @@ -135,7 +135,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, int err; struct net_device *dev; - ASSERT_RDEV_LOCK(rdev); + lockdep_assert_held(&rdev->sched_scan_mtx); if (!rdev->sched_scan_req) return 0; |