1 files changed, 7 insertions, 0 deletions

diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 26a72b0797a0..15feaeb5ced5 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -60,6 +60,8 @@ static int wiphy_suspend(struct device *dev, pm_message_t state)
         struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
         int ret = 0;
 
+        rdev->suspend_at = get_seconds();
+
         if (rdev->ops->suspend) {
                 rtnl_lock();
                 ret = rdev->ops->suspend(&rdev->wiphy);
@@ -74,6 +76,11 @@ static int wiphy_resume(struct device *dev)
         struct cfg80211_registered_device *rdev = dev_to_rdev(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();
                 ret = rdev->ops->resume(&rdev->wiphy);