Commit 18171520 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Johannes Berg
Browse files

mac80211: Use ktime_get_ts() 



do_posix_clock_monotonic_gettime() is a leftover from the initial
posix timer implementation which maps to ktime_get_ts().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 10d78f27

net/mac80211/debugfs_sta.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static ssize_t sta_connected_time_read(struct file *file, char __user *userbuf, 
	long connected_time_secs;

	char buf[100];

	int res;

	do_posix_clock_monotonic_gettime(&uptime);

	ktime_get_ts(&uptime);

	connected_time_secs = uptime.tv_sec - sta->last_connected;

	time_to_tm(connected_time_secs, 0, &result);

	result.tm_year -= 70;

net/mac80211/sta_info.c

+2 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, 


	sta->sta_state = IEEE80211_STA_NONE;



	do_posix_clock_monotonic_gettime(&uptime);

	ktime_get_ts(&uptime);

	sta->last_connected = uptime.tv_sec;

	ewma_init(&sta->avg_signal, 1024, 8);

	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) 
			STATION_INFO_STA_FLAGS |

			STATION_INFO_BEACON_LOSS_COUNT;



	do_posix_clock_monotonic_gettime(&uptime);

	ktime_get_ts(&uptime);

	sinfo->connected_time = uptime.tv_sec - sta->last_connected;



	sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE