diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-07 03:56:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:02:32 -0400 |
| commit | 4d0c8aead32ecdbe1310ad473b3637991f560865 (patch) | |
| tree | 6d7bbfc1676e5cf4d21dd61fc5ace1c041622c2c /net/wireless/scan.c | |
| parent | c1e6fb1aad0d4d4f032d46b6bab093a41c6c82bf (diff) | |
| download | linux-4d0c8aead32ecdbe1310ad473b3637991f560865.tar.bz2 | |
cfg80211: properly name driver locking
Currently we call that cfg80211_put_dev(), but that is
misleading. With the new convention of using 'rdev' for
registered_device variables, also call that function
cfg80211_unlock_rdev().
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 925399462a79..1625faf1de57 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -28,8 +28,6 @@ void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted) if (!dev) goto out; - WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); - /* * This must be before sending the other events! * Otherwise, wpa_supplicant gets completely confused with @@ -636,7 +634,7 @@ int cfg80211_wext_siwscan(struct net_device *dev, } else nl80211_send_scan_start(rdev, dev); out: - cfg80211_put_dev(rdev); + cfg80211_unlock_rdev(rdev); return err; } EXPORT_SYMBOL_GPL(cfg80211_wext_siwscan); @@ -945,7 +943,7 @@ int cfg80211_wext_giwscan(struct net_device *dev, } out: - cfg80211_put_dev(rdev); + cfg80211_unlock_rdev(rdev); return res; } EXPORT_SYMBOL_GPL(cfg80211_wext_giwscan); |