Skip to content

Commit

Permalink
cfg80211: track time using boottime
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann authored and Johannes Berg committed Jun 29, 2018
1 parent 8ba6731 commit fe0984d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion net/wireless/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct cfg80211_registered_device {
struct cfg80211_scan_request *scan_req; /* protected by RTNL */
struct sk_buff *scan_msg;
struct list_head sched_scan_req_list;
unsigned long suspend_at;
time64_t suspend_at;
struct work_struct scan_done_wk;

struct genl_info *cur_cmd_info;
Expand Down
4 changes: 2 additions & 2 deletions net/wireless/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit fe0984d

Please sign in to comment.