git.openwrt.org Git - openwrt/staging/blogic.git/blob

   1 From 2f0c9ac8362da09c80f1cd422ef7fd6fa9b252b9 Mon Sep 17 00:00:00 2001
   2 From: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
   3 Date: Mon, 17 Apr 2023 13:35:02 +0300
   4 Subject: [PATCH] wifi: ath11k: Fix incorrect update of radiotap fields
   5
   6 Fix incorrect update of ppdu stats causing incorrect radiotap
   7 fields.
   8
   9 Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
  10
  11 Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
  12 Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
  13 Link: https://lore.kernel.org/r/20230403195738.25367-3-quic_pradeepc@quicinc.com
  14 ---
  15  drivers/net/wireless/ath/ath11k/hal_rx.c | 4 ++--
  16  drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +-
  17  2 files changed, 3 insertions(+), 3 deletions(-)
  18
  19 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c
  20 +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c
  21 @@ -1029,7 +1029,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc
  22                 info1 = __le32_to_cpu(vht_sig->info1);
  23
  24                 ppdu_info->ldpc = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_SU_MU_CODING,
  25 -                                           info0);
  26 +                                           info1);
  27                 ppdu_info->mcs = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_MCS,
  28                                            info1);
  29                 gi_setting = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_GI_SETTING,
  30 @@ -1452,7 +1452,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc
  31                  * PHYRX_OTHER_RECEIVE_INFO TLV.
  32                  */
  33                 ppdu_info->rssi_comb =
  34 -                       FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB,
  35 +                       FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB,
  36                                   __le32_to_cpu(rssi->info0));
  37
  38                 if (db2dbm) {
  39 --- a/drivers/net/wireless/ath/ath11k/hal_rx.h
  40 +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h
  41 @@ -385,7 +385,7 @@ struct hal_rx_he_sig_b2_ofdma_info {
  42         __le32 info0;
  43  } __packed;
  44
  45 -#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB  GENMASK(15, 8)
  46 +#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB  GENMASK(15, 8)
  47
  48  #define HAL_RX_PHYRX_RSSI_PREAMBLE_PRI20       GENMASK(7, 0)
  49