stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	"A. Cody Schuffelen" <schuffelen@google.com>,
	Johannes Berg <johannes.berg@intel.com>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.4 39/73] virt_wifi: Return micros for BSS TSF values
Date: Mon, 19 Apr 2021 15:06:30 +0200	[thread overview]
Message-ID: <20210419130525.099356073@linuxfoundation.org> (raw)
In-Reply-To: <20210419130523.802169214@linuxfoundation.org>

From: A. Cody Schuffelen <schuffelen@google.com>

[ 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 <schuffelen@google.com>
Link: https://lore.kernel.org/r/20210318200419.1421034-1-schuffelen@google.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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 <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);
-- 
2.30.2




  parent reply	other threads:[~2021-04-19 13:26 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-19 13:05 [PATCH 5.4 00/73] 5.4.114-rc1 review Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 01/73] Revert "scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure" Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 02/73] Revert "scsi: qla2xxx: Fix stuck login session using prli_pend_timer" Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 03/73] scsi: qla2xxx: Dual FCP-NVMe target port support Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 04/73] scsi: qla2xxx: Fix device connect issues in P2P configuration Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 05/73] scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 06/73] scsi: qla2xxx: Add a shadow variable to hold disc_state history of fcport Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 07/73] scsi: qla2xxx: Fix stuck login session using prli_pend_timer Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 08/73] scsi: qla2xxx: Fix fabric scan hang Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 09/73] net/sctp: fix race condition in sctp_destroy_sock Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 10/73] Input: nspire-keypad - enable interrupts only when opened Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 11/73] gpio: sysfs: Obey valid_mask Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 12/73] dmaengine: dw: Make it dependent to HAS_IOMEM Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 13/73] ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 14/73] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 15/73] lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 16/73] arc: kernel: Return -EFAULT if copy_to_user() fails Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 17/73] ASoC: max98373: Added 30ms turn on/off time delay Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 18/73] neighbour: Disregard DEAD dst in neigh_update Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 19/73] ARM: keystone: fix integer overflow warning Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 20/73] ARM: omap1: fix building with clang IAS Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 21/73] drm/msm: Fix a5xx/a6xx timestamps Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 22/73] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 23/73] scsi: scsi_transport_srp: Dont block target in SRP_PORT_LOST state Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 24/73] net: ieee802154: stop dump llsec keys for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 25/73] net: ieee802154: forbid monitor for add llsec key Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 26/73] net: ieee802154: forbid monitor for del " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 27/73] net: ieee802154: stop dump llsec devs for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 28/73] net: ieee802154: forbid monitor for add llsec dev Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 29/73] net: ieee802154: forbid monitor for del " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 30/73] net: ieee802154: stop dump llsec devkeys for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 31/73] net: ieee802154: forbid monitor for add llsec devkey Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 32/73] net: ieee802154: forbid monitor for del " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 33/73] net: ieee802154: stop dump llsec seclevels for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 34/73] net: ieee802154: forbid monitor for add llsec seclevel Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 35/73] pcnet32: Use pci_resource_len to validate PCI resource Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 36/73] net/rds: Avoid potential use after free in rds_send_remove_from_sock Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 37/73] net: tipc: Fix spelling errors in net/tipc module Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 38/73] mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN Greg Kroah-Hartman
2021-04-19 13:06 ` Greg Kroah-Hartman [this message]
2021-04-19 13:06 ` [PATCH 5.4 40/73] Input: s6sy761 - fix coordinate read bit shift Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 41/73] Input: i8042 - fix Pegatron C15B ID entry Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 42/73] HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 43/73] dm verity fec: fix misaligned RS roots IO Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 44/73] readdir: make sure to verify directory entry for legacy interfaces too Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 45/73] arm64: fix inline asm in load_unaligned_zeropad() Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 46/73] arm64: alternatives: Move length validation in alternative_{insn, endif} Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 47/73] vfio/pci: Add missing range check in vfio_pci_mmap Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 48/73] riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM" Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 49/73] scsi: libsas: Reset num_scatter if libata marks qc as NODATA Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 50/73] netfilter: conntrack: do not print icmpv6 as unknown via /proc Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 51/73] libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 52/73] netfilter: bridge: add pre_exit hooks for ebtable unregistration Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 53/73] netfilter: arp_tables: add pre_exit hook for table unregister Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 54/73] net: macb: fix the restore of cmp registers Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 55/73] netfilter: nft_limit: avoid possible divide error in nft_limit_init Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 56/73] net: davicom: Fix regulator not turned off on failed probe Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 57/73] net: sit: Unregister catch-all devices Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 58/73] net: ip6_tunnel: " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 59/73] i40e: fix the panic when running bpf in xdpdrv mode Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 60/73] ibmvnic: avoid calling napi_disable() twice Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 61/73] ibmvnic: remove duplicate napi_schedule call in do_reset function Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 62/73] ibmvnic: remove duplicate napi_schedule call in open function Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 63/73] gro: ensure frag0 meets IP header alignment Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 64/73] ARM: footbridge: fix PCI interrupt mapping Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 65/73] arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 66/73] r8169: remove fiddling with the PCIe max read request size Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 67/73] r8169: simplify setting PCI_EXP_DEVCTL_NOSNOOP_EN Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 68/73] r8169: fix performance regression related to PCIe max read request size Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 69/73] r8169: improve rtl_jumbo_config Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 70/73] r8169: tweak max read request size for newer chips also in jumbo mtu mode Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 71/73] r8169: dont advertise pause in jumbo mode Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 72/73] ARM: 9071/1: uprobes: Dont hook on thumb instructions Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 73/73] net: phy: marvell: fix detection of PHY on Topaz switches Greg Kroah-Hartman
2021-04-19 21:17 ` [PATCH 5.4 00/73] 5.4.114-rc1 review Florian Fainelli
2021-04-20  0:09 ` Shuah Khan
2021-04-20  0:17 ` Guenter Roeck
2021-04-20  6:13 ` Jon Hunter
2021-04-20  8:26 ` Naresh Kamboju
2021-04-20  9:11 ` Sudip Mukherjee
2021-04-20 11:26 ` Samuel Zou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210419130525.099356073@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=schuffelen@google.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).