diff options
| author | Arnd Bergmann | 2018-06-18 17:11:14 +0200 |
|---|---|---|
| committer | Johannes Berg | 2018-06-29 09:49:28 +0200 |
| commit | fe0984d38938249f3f11fc558a8845fc6f8a0105 (patch) | |
| tree | 17567180d52ce42b221309252baa61aefdfd6961 /net/wireless/sysfs.c | |
| parent | rfkill: add header files to MAINTAINERS (diff) | |
| download | kernel-qcow2-linux-fe0984d38938249f3f11fc558a8845fc6f8a0105.tar.gz kernel-qcow2-linux-fe0984d38938249f3f11fc558a8845fc6f8a0105.tar.xz kernel-qcow2-linux-fe0984d38938249f3f11fc558a8845fc6f8a0105.zip | |
cfg80211: track time using boottime
The cfg80211 layer uses get_seconds() to read the current time
in its supend handling. This function is deprecated because of the 32-bit
time_t overflow, and it can cause unexpected behavior when the time
changes due to settimeofday() calls or leap second updates.
In many cases, we want to use monotonic time instead, however cfg80211
explicitly tracks the time spent in suspend, so this changes the
driver over to use ktime_get_boottime_seconds(), which is slightly
slower, but not used in a fastpath here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/sysfs.c')
| -rw-r--r-- | net/wireless/sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 570a2b67ca10..6ab32f6a1961 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c @@ -102,7 +102,7 @@ static int wiphy_suspend(struct device *dev) struct cfg80211_registered_device *rdev = dev_to_rdev(dev); int ret = 0; - rdev->suspend_at = get_seconds(); + rdev->suspend_at = ktime_get_boottime_seconds(); rtnl_lock(); if (rdev->wiphy.registered) { @@ -130,7 +130,7 @@ static int wiphy_resume(struct device *dev) int ret = 0; /* Age scan results with time spent in suspend */ - cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at); + cfg80211_bss_age(rdev, ktime_get_boottime_seconds() - rdev->suspend_at); rtnl_lock(); if (rdev->wiphy.registered && rdev->ops->resume) |