Merge tag 'ASB-2021-06-05_4.14-stable' of https://source.codeaurora.o…

…rg/quic/la/kernel/msm-4.14 into arrow-11.0 https://source.android.com/security/bulletin/2021-06-01 CVE-2020-14305 CVE-2020-14381 CVE-2021-0512 CVE-2021-3347
Neternels · Jun 16, 2021 · b7bf554 · b7bf554
2 parents c0f89ca + 9947d65
commit b7bf554
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virt_wifi.c
@@ -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/cfg80211.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_boot_ns(), 1000);
 
 	informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz,
 					   CFG80211_BSS_FTYPE_PRESP,
-					   fake_router_bssid,
-					   ktime_get_boot_ns(),
+					   fake_router_bssid, tsf,
 					   WLAN_CAPABILITY_ESS, 0,
 					   (void *)&ssid, sizeof(ssid),
 					   DBM_TO_MBM(-50), GFP_KERNEL);