On 1/17/2025 11:30 AM, Remi Pommarel wrote:
> Currently in ath12k_mac_op_sta_statistics() there is the following
> logic:
>
> if (!arsta->txrate.legacy && !arsta->txrate.nss)
> return;
>
> Because ath12k_sta_statistics is used to report many info to iw wlan0 link,
> if it return for empty legacy and nss of arsta->txrate, then the other
> stats after it will not be set.
>
> To address this issue remove the return and instead invert the logic to set
> the txrate logic if (arsta->txrate.legacy || arsta->txrate.nss).
>
> The same was done also in both ath10k with commit 1cd6ba8ae33e ("ath10k:
> remove return for NL80211_STA_INFO_TX_BITRATE") and ath11k as well with
> commit 1d795645e1ee ("ath11k: remove return for empty tx bitrate in
> mac_op_sta_statistics").
>
> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
> Signed-off-by: Remi Pommarel <repk@xxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath12k/mac.c | 29 +++++++++++++--------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
> index d493ec812055..cbc79ec7ac47 100644
> --- a/drivers/net/wireless/ath/ath12k/mac.c
> +++ b/drivers/net/wireless/ath/ath12k/mac.c
> @@ -8912,21 +8912,20 @@ static void ath12k_mac_op_sta_statistics(struct ieee80211_hw *hw,
> sinfo->tx_duration = arsta->tx_duration;
> sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);
>
> - if (!arsta->txrate.legacy && !arsta->txrate.nss)
> - return;
> -
> - if (arsta->txrate.legacy) {
> - sinfo->txrate.legacy = arsta->txrate.legacy;
> - } else {
> - sinfo->txrate.mcs = arsta->txrate.mcs;
> - sinfo->txrate.nss = arsta->txrate.nss;
> - sinfo->txrate.bw = arsta->txrate.bw;
> - sinfo->txrate.he_gi = arsta->txrate.he_gi;
> - sinfo->txrate.he_dcm = arsta->txrate.he_dcm;
> - sinfo->txrate.he_ru_alloc = arsta->txrate.he_ru_alloc;
> - }
> - sinfo->txrate.flags = arsta->txrate.flags;
> - sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
> + if (arsta->txrate.legacy || arsta->txrate.nss) {
> + if (arsta->txrate.legacy) {
> + sinfo->txrate.legacy = arsta->txrate.legacy;
> + } else {
> + sinfo->txrate.mcs = arsta->txrate.mcs;
> + sinfo->txrate.nss = arsta->txrate.nss;
> + sinfo->txrate.bw = arsta->txrate.bw;
> + sinfo->txrate.he_gi = arsta->txrate.he_gi;
> + sinfo->txrate.he_dcm = arsta->txrate.he_dcm;
> + sinfo->txrate.he_ru_alloc = arsta->txrate.he_ru_alloc;
> + }
> + sinfo->txrate.flags = arsta->txrate.flags;
> + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
> + }
>
> /* TODO: Use real NF instead of default one. */
> sinfo->signal = arsta->rssi_comb + ATH12K_DEFAULT_NOISE_FLOOR;
This patch conflicts with the following that is in the pending branch:
https://patchwork.kernel.org/project/linux-wireless/patch/20250115063537.35797-2-quic_lingbok@xxxxxxxxxxx/
The pending patch adds eht settings:
+ sinfo->txrate.eht_gi = arsta->txrate.eht_gi;
+ sinfo->txrate.eht_ru_alloc = arsta->txrate.eht_ru_alloc;
The pending branch will be promoted to ath-next & main soon, so please rebase
after that occurs
/jeff
