summaryrefslogtreecommitdiff
path: root/net/wireless/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-01 04:05:43 +0400
committerJohannes Berg <johannes.berg@intel.com>2013-02-04 21:57:45 +0400
commit4b1af4792a2aa686483fc9bb2155f7269fa6399c (patch)
treedf63754635bdf4079ca2d9dc80fe95a783cd4550 /net/wireless/scan.c
parent6b684db1db0df40275c7dfcc32a5d48eb72fe4e3 (diff)
downloadlinux-4b1af4792a2aa686483fc9bb2155f7269fa6399c.tar.xz
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/scan.c')
-rw-r--r--net/wireless/scan.c6
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)
kfree(bss);
}
-/* must hold dev->bss_lock! */
static void __cfg80211_unlink_bss(struct cfg80211_registered_device *dev,
struct cfg80211_internal_bss *bss)
{
+ lockdep_assert_held(&dev->bss_lock);
+
list_del_init(&bss->list);
rb_erase(&bss->rbn, &dev->bss_tree);
kref_put(&bss->ref, bss_release);
}
-/* must hold dev->bss_lock! */
static void __cfg80211_bss_expire(struct cfg80211_registered_device *dev,
unsigned long expire_time)
{
struct cfg80211_internal_bss *bss, *tmp;
bool expired = false;
+ lockdep_assert_held(&dev->bss_lock);
+
list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) {
if (atomic_read(&bss->hold))
continue;