diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-25 15:15:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-25 15:26:36 -0400 |
| commit | 855df36de365fb3b49eb06c352015e3d215b43fe (patch) | |
| tree | 2a76f128eb457e1bacb585260b3e03f72b03cc1e /net/mac80211/debugfs_sta.c | |
| parent | d6067f0e17eb1de7d9b1d792f67d17c6e894b770 (diff) | |
| parent | 97dc94f1d933c9df2c0b327066ea130c0e92083f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/debugfs_sta.c')
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 2ecb4deddb5d..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, 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; @@ -587,7 +587,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) DEBUGFS_ADD_COUNTER(tx_filtered, tx_filtered_count); DEBUGFS_ADD_COUNTER(tx_retry_failed, tx_retry_failed); DEBUGFS_ADD_COUNTER(tx_retry_count, tx_retry_count); - DEBUGFS_ADD_COUNTER(wep_weak_iv_count, wep_weak_iv_count); if (sizeof(sta->driver_buffered_tids) == sizeof(u32)) debugfs_create_x32("driver_buffered_tids", 0400, |