Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7742fce4 authored by Franky Lin's avatar Franky Lin Committed by Kalle Valo
Browse files

brcmfmac: reports boottime_ns while informing bss 



Provides a timestamp in bss information so user space can see when the
bss info was updated. Since tsf is not available from the dongle events
boottime is reported instead.

Reported-by: default avatarDmitry Shmidt <dimitrysh@google.com>
Reviewed-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent cb746e47

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -2728,7 +2728,6 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg, 
				   struct brcmf_bss_info_le *bi)

				   struct brcmf_bss_info_le *bi)

{

{

	struct wiphy *wiphy = cfg_to_wiphy(cfg);

	struct wiphy *wiphy = cfg_to_wiphy(cfg);

	struct ieee80211_channel *notify_channel;

	struct cfg80211_bss *bss;

	struct cfg80211_bss *bss;

	struct ieee80211_supported_band *band;

	struct ieee80211_supported_band *band;

	struct brcmu_chan ch;

	struct brcmu_chan ch;
@@ -2738,7 +2737,7 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg, 
	u16 notify_interval;

	u16 notify_interval;

	u8 *notify_ie;

	u8 *notify_ie;

	size_t notify_ielen;

	size_t notify_ielen;

	s32 notify_signal;

	struct cfg80211_inform_bss bss_data = { 0 };





	if (le32_to_cpu(bi->length) > WL_BSS_INFO_MAX) {

	if (le32_to_cpu(bi->length) > WL_BSS_INFO_MAX) {

		brcmf_err("Bss info is larger than buffer. Discarding\n");

		brcmf_err("Bss info is larger than buffer. Discarding\n");
@@ -2758,27 +2757,28 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg, 
		band = wiphy->bands[NL80211_BAND_5GHZ];

		band = wiphy->bands[NL80211_BAND_5GHZ];





	freq = ieee80211_channel_to_frequency(channel, band->band);

	freq = ieee80211_channel_to_frequency(channel, band->band);

	notify_channel = ieee80211_get_channel(wiphy, freq);

	bss_data.chan = ieee80211_get_channel(wiphy, freq);

	bss_data.scan_width = NL80211_BSS_CHAN_WIDTH_20;

	bss_data.boottime_ns = ktime_to_ns(ktime_get_boottime());





	notify_capability = le16_to_cpu(bi->capability);

	notify_capability = le16_to_cpu(bi->capability);

	notify_interval = le16_to_cpu(bi->beacon_period);

	notify_interval = le16_to_cpu(bi->beacon_period);

	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);

	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);

	notify_ielen = le32_to_cpu(bi->ie_length);

	notify_ielen = le32_to_cpu(bi->ie_length);

	notify_signal = (s16)le16_to_cpu(bi->RSSI) * 100;

	bss_data.signal = (s16)le16_to_cpu(bi->RSSI) * 100;





	brcmf_dbg(CONN, "bssid: %pM\n", bi->BSSID);

	brcmf_dbg(CONN, "bssid: %pM\n", bi->BSSID);

	brcmf_dbg(CONN, "Channel: %d(%d)\n", channel, freq);

	brcmf_dbg(CONN, "Channel: %d(%d)\n", channel, freq);

	brcmf_dbg(CONN, "Capability: %X\n", notify_capability);

	brcmf_dbg(CONN, "Capability: %X\n", notify_capability);

	brcmf_dbg(CONN, "Beacon interval: %d\n", notify_interval);

	brcmf_dbg(CONN, "Beacon interval: %d\n", notify_interval);

	brcmf_dbg(CONN, "Signal: %d\n", notify_signal);

	brcmf_dbg(CONN, "Signal: %d\n", bss_data.signal);





	bss = cfg80211_inform_bss(wiphy, notify_channel,

	bss = cfg80211_inform_bss_data(wiphy, &bss_data,

				       CFG80211_BSS_FTYPE_UNKNOWN,

				       CFG80211_BSS_FTYPE_UNKNOWN,

				       (const u8 *)bi->BSSID,

				       (const u8 *)bi->BSSID,

				       0, notify_capability,

				       0, notify_capability,

				       notify_interval, notify_ie,

				       notify_interval, notify_ie,

				  notify_ielen, notify_signal,

				       notify_ielen, GFP_KERNEL);

				  GFP_KERNEL);





	if (!bss)

	if (!bss)

		return -ENOMEM;

		return -ENOMEM;