Commit 7035ca47 authored by A. Cody Schuffelen's avatar A. Cody Schuffelen Committed by Zheng Zengkai
Browse files

virt_wifi: Return micros for BSS TSF values 



stable inclusion
from stable-5.10.32
commit 024f9d048000d2fd92040ba85c5513d1abbfeaa4
bugzilla: 51796

--------------------------------

[ Upstream commit b57aa17f ]

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: default avatarA. Cody Schuffelen <schuffelen@google.com>
Link: https://lore.kernel.org/r/20210318200419.1421034-1-schuffelen@google.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 01997f1f

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>



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);