From f5321447c2a6b15691a6f573d8daa2032c5e971e Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 14 Dec 2022 16:45:55 -0800 Subject: [PATCH] qcacmn: Move RX 2.0 code under WLAN_PKT_CAPTURE_RX_2_0 macro Move RX 2.0 specific code under WLAN_PKT_CAPTURE_RX_2_0 macro. Change-Id: Ic07bde8868850b8889941fc9054ad988617b5296 CRs-Fixed: 3415779 --- dp/wifi3.0/be/dp_be_rx.c | 2 +- dp/wifi3.0/dp_htt.h | 2 +- hal/wifi3.0/be/hal_be_api_mon.h | 2 +- hal/wifi3.0/hal_api_mon.h | 2 +- hal/wifi3.0/qca5332/hal_5332.c | 6 +++--- hal/wifi3.0/qcn9224/hal_9224.h | 2 +- hal/wifi3.0/qcn9224/v2/hal_9224v2.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dp/wifi3.0/be/dp_be_rx.c b/dp/wifi3.0/be/dp_be_rx.c index 454b4dbd31..032271199e 100644 --- a/dp/wifi3.0/be/dp_be_rx.c +++ b/dp/wifi3.0/be/dp_be_rx.c @@ -1524,7 +1524,7 @@ rel_da_peer: #endif /* WLAN_MLO_MULTI_CHIP */ #endif /* INTRA_BSS_FWD_OFFLOAD */ -#if defined(QCA_MONITOR_2_0_SUPPORT) || defined(CONFIG_WORD_BASED_TLV) +#if defined(WLAN_PKT_CAPTURE_RX_2_0) || defined(CONFIG_WORD_BASED_TLV) void dp_rx_word_mask_subscribe_be(struct dp_soc *soc, uint32_t *msg_word, void *rx_filter) diff --git a/dp/wifi3.0/dp_htt.h b/dp/wifi3.0/dp_htt.h index 8983b3e550..6f9d41545c 100644 --- a/dp/wifi3.0/dp_htt.h +++ b/dp/wifi3.0/dp_htt.h @@ -706,7 +706,7 @@ struct htt_rx_ring_tlv_filter { u_int32_t phy_err_mask; u_int32_t phy_err_mask_cont; #endif -#if defined(QCA_MONITOR_2_0_SUPPORT) || defined(CONFIG_WORD_BASED_TLV) || \ +#if defined(WLAN_PKT_CAPTURE_RX_2_0) || defined(CONFIG_WORD_BASED_TLV) || \ defined(CONFIG_MON_WORD_BASED_TLV) uint32_t rx_mpdu_start_wmask; uint16_t rx_mpdu_end_wmask; diff --git a/hal/wifi3.0/be/hal_be_api_mon.h b/hal/wifi3.0/be/hal_be_api_mon.h index f486b9b5bd..8b7f8b13ef 100644 --- a/hal/wifi3.0/be/hal_be_api_mon.h +++ b/hal/wifi3.0/be/hal_be_api_mon.h @@ -2326,7 +2326,7 @@ hal_rx_parse_receive_user_info(struct hal_soc *hal_soc, uint8_t *tlv, return HAL_TLV_STATUS_PPDU_NOT_DONE; } -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 static inline void hal_rx_status_get_mpdu_retry_cnt(struct hal_rx_ppdu_info *ppdu_info, hal_rx_mon_ppdu_end_user_t *rx_ppdu_end_user) diff --git a/hal/wifi3.0/hal_api_mon.h b/hal/wifi3.0/hal_api_mon.h index 1c622af03c..7710559feb 100644 --- a/hal/wifi3.0/hal_api_mon.h +++ b/hal/wifi3.0/hal_api_mon.h @@ -1316,7 +1316,7 @@ struct hal_rx_ppdu_info { struct hal_rx_mon_mpdu_info mpdu_info[HAL_MAX_UL_MU_USERS]; /* placeholder to hold packet buffer info */ struct hal_mon_packet_info packet_info; -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 /* per user per MPDU queue */ qdf_nbuf_queue_t mpdu_q[HAL_MAX_UL_MU_USERS]; #endif diff --git a/hal/wifi3.0/qca5332/hal_5332.c b/hal/wifi3.0/qca5332/hal_5332.c index c9311c3c01..8721b92058 100644 --- a/hal/wifi3.0/qca5332/hal_5332.c +++ b/hal/wifi3.0/qca5332/hal_5332.c @@ -1383,7 +1383,7 @@ static void hal_hw_txrx_ops_attach_qca5332(struct hal_soc *hal_soc) hal_rx_link_desc_msdu0_ptr_5332; hal_soc->ops->hal_reo_status_get_header = hal_reo_status_get_header_5332; -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 hal_soc->ops->hal_rx_status_get_tlv_info = hal_rx_status_get_tlv_info_wrapper_be; #endif @@ -1949,7 +1949,7 @@ struct hal_hw_srng_config hw_srng_table_5332[] = { .reg_size = {}, .max_size = HAL_RXDMA_MAX_RING_SIZE, }, -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 { /* RXDMA_MONITOR_BUF */ .start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF, .max_rings = 1, @@ -1979,7 +1979,7 @@ struct hal_hw_srng_config hw_srng_table_5332[] = { .reg_size = {}, .max_size = HAL_RXDMA_MAX_RING_SIZE, }, -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 { /* RXDMA_MONITOR_DST */ .start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0, .max_rings = 2, diff --git a/hal/wifi3.0/qcn9224/hal_9224.h b/hal/wifi3.0/qcn9224/hal_9224.h index 527327f3d2..cf2e972487 100644 --- a/hal/wifi3.0/qcn9224/hal_9224.h +++ b/hal/wifi3.0/qcn9224/hal_9224.h @@ -1588,7 +1588,7 @@ static void hal_hw_txrx_ops_attach_qcn9224(struct hal_soc *hal_soc) hal_rx_link_desc_msdu0_ptr_9224; hal_soc->ops->hal_reo_status_get_header = hal_reo_status_get_header_9224; -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 hal_soc->ops->hal_rx_status_get_tlv_info = hal_rx_status_get_tlv_info_wrapper_be; #endif diff --git a/hal/wifi3.0/qcn9224/v2/hal_9224v2.c b/hal/wifi3.0/qcn9224/v2/hal_9224v2.c index 792a7534ab..2f33a49115 100644 --- a/hal/wifi3.0/qcn9224/v2/hal_9224v2.c +++ b/hal/wifi3.0/qcn9224/v2/hal_9224v2.c @@ -358,7 +358,7 @@ struct hal_hw_srng_config hw_srng_table_9224v2[] = { .reg_size = {}, .max_size = HAL_RXDMA_MAX_RING_SIZE, }, -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 { /* RXDMA_MONITOR_BUF */ .start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF, .max_rings = 1, @@ -388,7 +388,7 @@ struct hal_hw_srng_config hw_srng_table_9224v2[] = { .reg_size = {}, .max_size = HAL_RXDMA_MAX_RING_SIZE, }, -#ifdef QCA_MONITOR_2_0_SUPPORT +#ifdef WLAN_PKT_CAPTURE_RX_2_0 { /* RXDMA_MONITOR_DST */ .start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0, .max_rings = 2,