cfg80211: move locking into cfg80211_bss_age

There's no reason for it to require external
locking, move it into the function.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 34b47b30be88..1494d947e8dd 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -231,15 +231,16 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
         return 0;
 }
 
-/* must hold dev->bss_lock! */
 void cfg80211_bss_age(struct cfg80211_registered_device *dev,
                       unsigned long age_secs)
 {
         struct cfg80211_internal_bss *bss;
         unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC);
 
+        spin_lock_bh(&dev->bss_lock);
         list_for_each_entry(bss, &dev->bss_list, list)
                 bss->ts -= age_jiffies;
+        spin_unlock_bh(&dev->bss_lock);
 }
 
 void cfg80211_bss_expire(struct cfg80211_registered_device *dev)
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 9bf6d5e32166..73bf39f11314 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -108,9 +108,7 @@ static int wiphy_resume(struct device *dev)
         int ret = 0;
 
         /* Age scan results with time spent in suspend */
-        spin_lock_bh(&rdev->bss_lock);
         cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at);
-        spin_unlock_bh(&rdev->bss_lock);
 
         if (rdev->ops->resume) {
                 rtnl_lock();