---

yaml --- r: 352553 b: refs/heads/master c: 4b1af47 h: refs/heads/master i: 352551: 6fdbeab v: v3
git-mirror · Feb 4, 2013 · 1a8ffbc · 1a8ffbc
1 parent 456225b
commit 1a8ffbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b684db1db0df40275c7dfcc32a5d48eb72fe4e3
+refs/heads/master: 4b1af4792a2aa686483fc9bb2155f7269fa6399c
diff --git a/trunk/net/wireless/scan.c b/trunk/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;