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=unavailable 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 0360DC43215 for ; Tue, 3 Dec 2019 22:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C048920656 for ; Tue, 3 Dec 2019 22:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413321; bh=KuQUYgjE/jl4rzGGVvalCHJiUrChKVVEEiIPzv+P1Y8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IRLs71rCahEJVpqGWyxN/kG//lN6orT0DddbOwGCTWZkw5hYb4pZHnzlFdY6uf4Y0 DhSpBMGV04eb7l5/7JgweyrbMcKOmrDPJmG/3gS0/GE1fV3MiQ0L0eTSqG2rxzvdMm IP+t0cgGUrltXp8dEx9uq22LF7ACx1LdqVwX+cp0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729468AbfLCWsk (ORCPT ); Tue, 3 Dec 2019 17:48:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:39248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729155AbfLCWsg (ORCPT ); Tue, 3 Dec 2019 17:48:36 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 3E04720656; Tue, 3 Dec 2019 22:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413315; bh=KuQUYgjE/jl4rzGGVvalCHJiUrChKVVEEiIPzv+P1Y8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KBa9Dsxd3DbyYwiW2WAl4+s1SmruLXoqvqeEUDgY19p8/xVazp5SSuV2OUa3Uf8Cc E052nczFAEmGAFW8oViLXxEHdLk2LfVtjKzvIHT8YJXFCrTb/+Qo0+DijYVnHdFiXF DVj5hpu0qfVhphdHgXRuNT/QQRpBSRKmvV5d25+c= 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.19 044/321] mac80211: fix station inactive_time shortly after boot Date: Tue, 3 Dec 2019 23:31:50 +0100 Message-Id: <20191203223429.401517191@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 f34202242d24d..507409e3fd39c 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2356,7 +2356,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