Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Ahmed Zaki <anzaki@gmail.com>
To:     linux-wireless@vger.kernel.org
Cc:     anzaki@gmail.com
Subject: [PATCH 1/1] sta_info: fix insane values in iw sta dump "inactive time"
Date:   Wed, 30 Oct 2019 15:31:53 -0600
Message-Id: <20191030213153.3196-2-anzaki@gmail.com>
In-Reply-To: <20191030213153.3196-1-anzaki@gmail.com>
References: <20191030213153.3196-1-anzaki@gmail.com>
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

In the first 5 mins after boot (initial jiffies),
ieee80211_sta_last_active() returns zero in case last_ack is zero. This
leads to insane values appearing in "inactive time".

Fix by returning last_rx if last_ack == 0.
---
 net/mac80211/sta_info.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index bd11fef2139f..428866ff7c0a 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2457,7 +2457,8 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta)
 {
 	struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta);
 
-	if (time_after(stats->last_rx, sta->status_stats.last_ack))
+	if (!sta->status_stats.last_ack ||
+		time_after(stats->last_rx, sta->status_stats.last_ack))
 		return stats->last_rx;
 	return sta->status_stats.last_ack;
 }
-- 
2.17.1