samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Add change to modify if to ifdef

Browse Source 
Add change to modify if to ifdef

Change-Id: I49e3841deb4168cbbc4e0a4f045413717aa97d2a
CRs-Fixed: 3050747
This commit is contained in:
Naga
2021-10-05 16:44:33 +05:30
committed by Madan Koyyalamudi
parent 1648e13dbe
commit c46ec16889
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dp/wifi3.0/dp_htt.c
View File

@@ -494,7 +494,7 @@ int htt_srng_setup(struct htt_soc *soc, int mac_id,
htt_ring_id = HTT_RXDMA_NON_MONITOR_DEST_RING; htt_ring_id = HTT_RXDMA_NON_MONITOR_DEST_RING;
htt_ring_type = HTT_HW_TO_SW_RING; htt_ring_type = HTT_HW_TO_SW_RING;
break; break;
#if QCA_MONITOR_2_0_SUPPORT_WAR #ifdef QCA_MONITOR_2_0_SUPPORT_WAR
// WAR till fw htt.h changes are merged // WAR till fw htt.h changes are merged
case TX_MONITOR_BUF: case TX_MONITOR_BUF:
htt_ring_id = HTT_TX_MON_HOST2MON_BUF_RING; htt_ring_id = HTT_TX_MON_HOST2MON_BUF_RING;

16
dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c
View File

@@ -37,7 +37,7 @@ void dp_rx_mon_packet_length_set(uint32_t *msg_word,
{ {
if (!msg_word || !tlv_filter) if (!msg_word || !tlv_filter)
return; return;
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
HTT_RX_MONITOR_CFG_CONFIG_LENGTH_MGMT_SET(*msg_word, HTT_RX_MONITOR_CFG_CONFIG_LENGTH_MGMT_SET(*msg_word,
tlv_filter->mgmt_dma_length); tlv_filter->mgmt_dma_length);
HTT_RX_MONITOR_CFG_CONFIG_LENGTH_CTRL_SET(*msg_word, HTT_RX_MONITOR_CFG_CONFIG_LENGTH_CTRL_SET(*msg_word,
@@ -53,7 +53,7 @@ void dp_rx_mon_enable_mpdu_logging(uint32_t *msg_word,
if (!msg_word || !tlv_filter) if (!msg_word || !tlv_filter)
return; return;
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
if (htt_tlv_filter->mgmt_mpdu_log) if (htt_tlv_filter->mgmt_mpdu_log)
HTT_RX_MONITOR_CFG_MPDU_LOGGING_SET(*msg_word, MGMT, HTT_RX_MONITOR_CFG_MPDU_LOGGING_SET(*msg_word, MGMT,
tlv_filter->mgmt_mpdu_log); tlv_filter->mgmt_mpdu_log);
@@ -75,7 +75,7 @@ dp_rx_mon_word_mask_subscribe(uint32_t *msg_word,
if (!msg_word || !tlv_filter) if (!msg_word || !tlv_filter)
return; return;
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_WMASK_SET(*msg_word, HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_WMASK_SET(*msg_word,
tlv_filter->rx_mpdu_start_word_mask); tlv_filter->rx_mpdu_start_word_mask);
@@ -365,7 +365,7 @@ htt_tx_tlv_filter_mask_set_in1(uint32_t *msg_word,
MACTX_USER_DESC_COMMON, MACTX_USER_DESC_COMMON,
tlv->mactx_user_desc_cmn); tlv->mactx_user_desc_cmn);
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
if (tlv->l_sig_a) if (tlv->l_sig_a)
htt_tx_monitor_tlv_filter_in1_enable_set(*msg_word, htt_tx_monitor_tlv_filter_in1_enable_set(*msg_word,
L_SIG_A, L_SIG_A,
@@ -520,7 +520,7 @@ htt_tx_tlv_filter_mask_set_in2(uint32_t *msg_word,
TQM_ACKED_1K_MPDU, TQM_ACKED_1K_MPDU,
tlv->tqm_acked_1k_mpdu); tlv->tqm_acked_1k_mpdu);
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
if (tlv->txpcu_buf_status) if (tlv->txpcu_buf_status)
htt_tx_monitor_tlv_filter_in2_enable_set(*msg_word, htt_tx_monitor_tlv_filter_in2_enable_set(*msg_word,
TXPCU_BUFFER_STATUS, TXPCU_BUFFER_STATUS,
@@ -714,7 +714,7 @@ int htt_h2t_tx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
hal_get_srng_params(soc->hal_soc, hal_ring_hdl, &srng_params); hal_get_srng_params(soc->hal_soc, hal_ring_hdl, &srng_params);
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
switch (hal_ring_type) { switch (hal_ring_type) {
case TX_MONITOR_BUF: case TX_MONITOR_BUF:
htt_ring_id = HTT_TX_MON_HOST2MON_BUF_RING; htt_ring_id = HTT_TX_MON_HOST2MON_BUF_RING;
@@ -777,7 +777,7 @@ int htt_h2t_tx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_SET(*msg_word, HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_SET(*msg_word,
ring_buf_size); ring_buf_size);
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
if (htt_tlv_filter->mgmt_filter) if (htt_tlv_filter->mgmt_filter)
htt_tx_ring_pkt_type_set(*msg_word, ENABLE_FLAGS, htt_tx_ring_pkt_type_set(*msg_word, ENABLE_FLAGS,
MGMT, 1); MGMT, 1);
@@ -879,7 +879,7 @@ int htt_h2t_tx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
HTT_TX_MONITOR_CFG_RXPCU_USER_SETUP_WORD_MASK_SET(*msg_word, HTT_TX_MONITOR_CFG_RXPCU_USER_SETUP_WORD_MASK_SET(*msg_word,
htt_tlv_filter->wmask.rxpcu_user_setup); htt_tlv_filter->wmask.rxpcu_user_setup);
#if QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */ #ifdef QCA_MONITOR_2_0_SUPPORT_WAR /* Yet to get FW support */
htt_tx_ring_pkt_type_set(*msg_word, ENABLE_MSDU_OR_MPDU_LOGGING, htt_tx_ring_pkt_type_set(*msg_word, ENABLE_MSDU_OR_MPDU_LOGGING,
MGMT, MGMT,
htt_tlv_filter->mgmt_mpdu_log); htt_tlv_filter->mgmt_mpdu_log);

8
dp/wifi3.0/monitor/dp_mon.h
View File

@@ -138,7 +138,15 @@ QDF_STATUS dp_mon_vdev_detach(struct dp_vdev *vdev);
* Return: QDF_STATUS_SUCCESS: Success * Return: QDF_STATUS_SUCCESS: Success
* QDF_STATUS_E_NOMEM: Error * QDF_STATUS_E_NOMEM: Error
*/ */
#if defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(FEATURE_PERPKT_INFO)
QDF_STATUS dp_mon_peer_attach(struct dp_peer *peer); QDF_STATUS dp_mon_peer_attach(struct dp_peer *peer);
#else
static inline
QDF_STATUS dp_mon_peer_attach(struct dp_peer *peer)
{
return QDF_STATUS_SUCCESS;
}
#endif
/* /*
* dp_mon_peer_detach() - DP monitor peer detach * dp_mon_peer_detach() - DP monitor peer detach