aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/debugfs_sta.c2
-rw-r--r--net/mac80211/sta_info.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index ee82e1f0a9e7..3db96648b45a 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -124,7 +124,7 @@ static ssize_t sta_connected_time_read(struct file *file, char __user *userbuf,
124 long connected_time_secs; 124 long connected_time_secs;
125 char buf[100]; 125 char buf[100];
126 int res; 126 int res;
127 do_posix_clock_monotonic_gettime(&uptime); 127 ktime_get_ts(&uptime);
128 connected_time_secs = uptime.tv_sec - sta->last_connected; 128 connected_time_secs = uptime.tv_sec - sta->last_connected;
129 time_to_tm(connected_time_secs, 0, &result); 129 time_to_tm(connected_time_secs, 0, &result);
130 result.tm_year -= 70; 130 result.tm_year -= 70;
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 6fe48f64d0e4..f41177f58b30 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -350,7 +350,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
350 350
351 sta->sta_state = IEEE80211_STA_NONE; 351 sta->sta_state = IEEE80211_STA_NONE;
352 352
353 do_posix_clock_monotonic_gettime(&uptime); 353 ktime_get_ts(&uptime);
354 sta->last_connected = uptime.tv_sec; 354 sta->last_connected = uptime.tv_sec;
355 ewma_init(&sta->avg_signal, 1024, 8); 355 ewma_init(&sta->avg_signal, 1024, 8);
356 for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++) 356 for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
@@ -1747,7 +1747,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
1747 STATION_INFO_STA_FLAGS | 1747 STATION_INFO_STA_FLAGS |
1748 STATION_INFO_BEACON_LOSS_COUNT; 1748 STATION_INFO_BEACON_LOSS_COUNT;
1749 1749
1750 do_posix_clock_monotonic_gettime(&uptime); 1750 ktime_get_ts(&uptime);
1751 sinfo->connected_time = uptime.tv_sec - sta->last_connected; 1751 sinfo->connected_time = uptime.tv_sec - sta->last_connected;
1752 1752
1753 sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx); 1753 sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);