Commit 9a159093 authored by Alvin Šipraga's avatar Alvin Šipraga Committed by Kalle Valo
Browse files

brcmfmac: correctly report average RSSI in station info 



The rx_lastpkt_rssi field provided by the firmware is suitable for
NL80211_STA_INFO_{SIGNAL,CHAIN_SIGNAL}, while the rssi field is an
average. Fix up the assignments and set the correct STA_INFO bits. This
lets userspace know that the average RSSI is part of the station info.

Fixes: cae355dc ("brcmfmac: Add RSSI information to get_station.")
Signed-off-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210506132010.3964484-2-alsi@bang-olufsen.dk
parent feb45643

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

+20 −16
Original line number Diff line number Diff line
@@ -2767,8 +2767,9 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
	struct brcmf_sta_info_le sta_info_le;

	u32 sta_flags;

	u32 is_tdls_peer;

	s32 total_rssi;

	s32 count_rssi;

	s32 total_rssi_avg = 0;

	s32 total_rssi = 0;

	s32 count_rssi = 0;

	int rssi;

	u32 i;
@@ -2834,24 +2835,27 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES);

			sinfo->rx_bytes = le64_to_cpu(sta_info_le.rx_tot_bytes);

		}

		total_rssi = 0;

		count_rssi = 0;

		for (i = 0; i < BRCMF_ANT_MAX; i++) {

			if (sta_info_le.rssi[i]) {

			if (sta_info_le.rssi[i] == 0 ||

			    sta_info_le.rx_lastpkt_rssi[i] == 0)

				continue;

			sinfo->chains |= BIT(count_rssi);

				sinfo->chain_signal_avg[count_rssi] =

					sta_info_le.rssi[i];

			sinfo->chain_signal[count_rssi] =

				sta_info_le.rx_lastpkt_rssi[i];

			sinfo->chain_signal_avg[count_rssi] =

				sta_info_le.rssi[i];

				total_rssi += sta_info_le.rssi[i];

			total_rssi += sta_info_le.rx_lastpkt_rssi[i];

			total_rssi_avg += sta_info_le.rssi[i];

			count_rssi++;

		}

		}

		if (count_rssi) {

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);

			total_rssi /= count_rssi;

			sinfo->signal = total_rssi;

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);

			sinfo->filled |=

				BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL_AVG);

			sinfo->signal = total_rssi / count_rssi;

			sinfo->signal_avg = total_rssi_avg / count_rssi;

		} else if (test_bit(BRCMF_VIF_STATUS_CONNECTED,

			&ifp->vif->sme_state)) {

			memset(&scb_val, 0, sizeof(scb_val));