Commit 91d8a13f authored Mar 18, 2021 by A. Cody Schuffelen

FROMGIT: virt_wifi: Return micros for BSS TSF values



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.

Bug: 181840234
Test: atest CtsWifiTestCases:android.net.wifi.cts.ScanResultTest#testScanResultTimeStamp -- --abi x86_64
Signed-off-by: A. Cody Schuffelen <schuffelen@google.com>
Link: https://lore.kernel.org/r/20210318200419.1421034-1-schuffelen@google.com


Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit b57aa17f07c9270e576ef7df09f142978b5a75f0
https: //git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git master)
Change-Id: Icafc24ad303357926cbe955ffa12e28e0bf31e6f

parent 8aa2c72d

drivers/net/wireless/virt_wifi.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <net/cfg80211.h>
		#include <net/rtnetlink.h>
		#include <linux/etherdevice.h>
		#include <linux/math64.h>
		#include <linux/module.h>
		#include <net/virt_wifi.h>

		@@ -173,11 +174,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);