From d38acd0c2f2cf7e2d1f97981b402b58caaa75850 Mon Sep 17 00:00:00 2001 From: Padma Raghunathan Date: Fri, 8 May 2020 16:19:52 +0530 Subject: [PATCH] qcacmn: Fix access to rx mpdu start tlv MPDU start TLV structure is different across pine and hk/cyp. The access to individual members of this structure is already taken care in HAL APIs. Tha addition of offset is redundant and wrongly defined offset values led to wrong interpretation of mpdu start tlv fields like RSSI in QCN9000. Change-Id: I3c0daa1c9117eecd1566a1d52d794e92dc292fa4 CRs-Fixed: 2682570 --- hal/wifi3.0/hal_generic_api.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hal/wifi3.0/hal_generic_api.h b/hal/wifi3.0/hal_generic_api.h index d0374605d125..8c3b39ae39e7 100644 --- a/hal/wifi3.0/hal_generic_api.h +++ b/hal/wifi3.0/hal_generic_api.h @@ -1549,11 +1549,8 @@ hal_rx_status_get_tlv_info_generic(void *rx_tlv_hdr, void *ppduinfo, } case WIFIRX_MPDU_START_E: { - uint8_t *rx_mpdu_start = - (uint8_t *)rx_tlv + HAL_RX_OFFSET(UNIFIED_RX_MPDU_START_0, - RX_MPDU_INFO_RX_MPDU_INFO_DETAILS); - uint32_t ppdu_id = - HAL_RX_GET_PPDU_ID(rx_mpdu_start); + uint8_t *rx_mpdu_start = (uint8_t *)rx_tlv; + uint32_t ppdu_id = HAL_RX_GET_PPDU_ID(rx_mpdu_start); uint8_t filter_category = 0; ppdu_info->nac_info.fc_valid = @@ -1602,7 +1599,7 @@ hal_rx_status_get_tlv_info_generic(void *rx_tlv_hdr, void *ppduinfo, } else { ppdu_info->rx_status.ppdu_len += HAL_RX_GET(rx_mpdu_start, RX_MPDU_INFO_13, - MPDU_LENGTH); + MPDU_LENGTH); } filter_category =