diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-01-31 19:05:43 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-04 12:57:45 -0500 |
commit | 4b1af4792a2aa686483fc9bb2155f7269fa6399c (patch) | |
tree | df63754635bdf4079ca2d9dc80fe95a783cd4550 /net/wireless | |
parent | 6b684db1db0df40275c7dfcc32a5d48eb72fe4e3 (diff) |
cfg80211: use lockdep to assert lock is held
Instead of annotating with a comment, add a lockdep
annotation which also serves as documentation.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/scan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 1494d947e8dd..a56287bb550c 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
@@ -41,22 +41,24 @@ static void bss_release(struct kref *ref) | |||
41 | kfree(bss); | 41 | kfree(bss); |
42 | } | 42 | } |
43 | 43 | ||
44 | /* must hold dev->bss_lock! */ | ||
45 | static void __cfg80211_unlink_bss(struct cfg80211_registered_device *dev, | 44 | static void __cfg80211_unlink_bss(struct cfg80211_registered_device *dev, |
46 | struct cfg80211_internal_bss *bss) | 45 | struct cfg80211_internal_bss *bss) |
47 | { | 46 | { |
47 | lockdep_assert_held(&dev->bss_lock); | ||
48 | |||
48 | list_del_init(&bss->list); | 49 | list_del_init(&bss->list); |
49 | rb_erase(&bss->rbn, &dev->bss_tree); | 50 | rb_erase(&bss->rbn, &dev->bss_tree); |
50 | kref_put(&bss->ref, bss_release); | 51 | kref_put(&bss->ref, bss_release); |
51 | } | 52 | } |
52 | 53 | ||
53 | /* must hold dev->bss_lock! */ | ||
54 | static void __cfg80211_bss_expire(struct cfg80211_registered_device *dev, | 54 | static void __cfg80211_bss_expire(struct cfg80211_registered_device *dev, |
55 | unsigned long expire_time) | 55 | unsigned long expire_time) |
56 | { | 56 | { |
57 | struct cfg80211_internal_bss *bss, *tmp; | 57 | struct cfg80211_internal_bss *bss, *tmp; |
58 | bool expired = false; | 58 | bool expired = false; |
59 | 59 | ||
60 | lockdep_assert_held(&dev->bss_lock); | ||
61 | |||
60 | list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) { | 62 | list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) { |
61 | if (atomic_read(&bss->hold)) | 63 | if (atomic_read(&bss->hold)) |
62 | continue; | 64 | continue; |