From 1a8ffbca5d4444fe9ebfa0821890968d2d5823e3 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 1 Feb 2013 01:05:43 +0100
Subject: [PATCH] --- yaml --- r: 352553 b: refs/heads/master c:
 4b1af4792a2aa686483fc9bb2155f7269fa6399c h: refs/heads/master i:   352551:
 6fdbeaba9486e83c7f2c67d1cafa9d612615c41d v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/scan.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5079473c7bdc..95395e6f1f78 100644
--- 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
index 1494d947e8dd..a56287bb550c 100644
--- 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;