From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D518C2BC73 for ; Wed, 4 Dec 2019 18:10:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 347F720862 for ; Wed, 4 Dec 2019 18:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483002; bh=B7opMVJaIwHaZw+dAM31DT+J8n68iSZXtJI1J3cCxSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sGvK5hI33g5jpGbfbwZElc0HCpTdgdc66NDav70wOLdkmvpHMpyTDYPnqD1NQ/kqJ dr93GOtqGEABrKrQvWK218ZWGLU76qvW2MeV4P6ccfZkMpgKCFhcO5j13UnHYBsGLF G70q+YvO0XXx+mrGUd1Rp3HDtV0EfMJN/zv5CesQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731174AbfLDSKA (ORCPT ); Wed, 4 Dec 2019 13:10:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:36616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731170AbfLDSKA (ORCPT ); Wed, 4 Dec 2019 13:10:00 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7DC920675; Wed, 4 Dec 2019 18:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482999; bh=B7opMVJaIwHaZw+dAM31DT+J8n68iSZXtJI1J3cCxSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xEe8V0B0E66CKlzPFEuy3k6F3koAR876cRfpXE1MSRNaPzph1AX5kD/IrB6ChrbdS CbRXCglwnZtquH36zeorMNmOTHgr1zXnNUXYDqtKSIr6ZZRG2PuZcL0RccItdbMRit lVS5wx8RhdAIbSHg6EOHZRdFzb6q3LqU1euM5zE4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ahmed Zaki , Johannes Berg , Sasha Levin Subject: [PATCH 4.9 011/125] mac80211: fix station inactive_time shortly after boot Date: Wed, 4 Dec 2019 18:55:16 +0100 Message-Id: <20191204175314.273108057@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ahmed Zaki [ Upstream commit 285531f9e6774e3be71da6673d475ff1a088d675 ] In the first 5 minutes after boot (time of INITIAL_JIFFIES), ieee80211_sta_last_active() returns zero if last_ack is zero. This leads to "inactive time" showing jiffies_to_msecs(jiffies). # iw wlan0 station get fc:ec:da:64:a6:dd Station fc:ec:da:64:a6:dd (on wlan0) inactive time: 4294894049 ms . . connected time: 70 seconds Fix by returning last_rx if last_ack == 0. Signed-off-by: Ahmed Zaki Link: https://lore.kernel.org/r/20191031121243.27694-1-anzaki@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- 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 892c392ff8fcc..8e8a185dbb9b1 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2305,7 +2305,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.20.1