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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 65758C433B4 for ; Mon, 12 Apr 2021 16:32:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 497FD6128E for ; Mon, 12 Apr 2021 16:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245334AbhDLQcd (ORCPT ); Mon, 12 Apr 2021 12:32:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:35660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245177AbhDLQ3y (ORCPT ); Mon, 12 Apr 2021 12:29:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B07E61393; Mon, 12 Apr 2021 16:25:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244752; bh=AZG4uhieMhRSVcxgjq0/ZqtPsJSZZi9hjmpwCslHhFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SerFPbUrMMIBW0MQgE4lU26VN/HsmUXXFB0bg96iwlLi+rmkoAg72OXX2DA4TVA7m Buk0UMrFh4+GD5oX20zmbjTu1I7dzZ42kepZU9z+YHr1HRHhTM3Yp3hikyrVYMzN29 wyIhp39psWCBOacpFIu37jed6RvTqt9b1eqQ5e4evAjepfT4kd4GoNQVWlD8ipqBvS 62wuMw1BnqKl2ISS+ud8rA5jqOiOCUq0nReZx/CPYUWXqmYhmiUWz06ZkkST1P5cte DEKNAy84LAOyyU0WP6x2iyxWf5nuicqygH+rxSjLvNSmeFF/dp9fuIxIZRvixKianc oy3uQdir1Rscw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "A. Cody Schuffelen" , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 39/39] virt_wifi: Return micros for BSS TSF values Date: Mon, 12 Apr 2021 12:25:01 -0400 Message-Id: <20210412162502.314854-39-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162502.314854-1-sashal@kernel.org> References: <20210412162502.314854-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: "A. Cody Schuffelen" [ Upstream commit b57aa17f07c9270e576ef7df09f142978b5a75f0 ] cfg80211_inform_bss expects to receive a TSF value, but is given the time since boot in nanoseconds. TSF values are expected to be at microsecond scale rather than nanosecond scale. Signed-off-by: A. Cody Schuffelen Link: https://lore.kernel.org/r/20210318200419.1421034-1-schuffelen@google.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/virt_wifi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virt_wifi.c index 01305ba2d3aa..9d04ca53229b 100644 --- a/drivers/net/wireless/virt_wifi.c +++ b/drivers/net/wireless/virt_wifi.c @@ -12,6 +12,7 @@ #include #include #include +#include #include static struct wiphy *common_wiphy; @@ -168,11 +169,11 @@ static void virt_wifi_scan_result(struct work_struct *work) scan_result.work); struct wiphy *wiphy = priv_to_wiphy(priv); struct cfg80211_scan_info scan_info = { .aborted = false }; + u64 tsf = div_u64(ktime_get_boottime_ns(), 1000); informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz, CFG80211_BSS_FTYPE_PRESP, - fake_router_bssid, - ktime_get_boottime_ns(), + fake_router_bssid, tsf, WLAN_CAPABILITY_ESS, 0, (void *)&ssid, sizeof(ssid), DBM_TO_MBM(-50), GFP_KERNEL); -- 2.30.2