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

qcacmn: Fix compile error while enable CONFIG_REMOVE_PKT_LOG

Browse Source 
Cleanup the code to fix the compile error while setting
CONFIG_REMOVE_PKT_LOG=y & CONFIG_WDI_EVENT_ENABLE=n
with Hasting

Change-Id: I493fbddec865fe20789022445b0f155201772119
This commit is contained in:
Chaoli Zhou
2020-07-01 19:08:36 +08:00
committed by nshrivas
parent f2d33c938b
commit 7c40c9d475
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dp/wifi3.0/dp_internal.h
View File

@@ -1664,6 +1664,11 @@ static inline QDF_STATUS dp_h2t_cfg_stats_msg_send(struct dp_pdev *pdev,
return 0; return 0;
} }
static inline void
dp_pkt_log_init(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, void *scn)
{
}
static inline void static inline void
dp_hif_update_pipe_callback(struct dp_soc *dp_soc, void *cb_context, dp_hif_update_pipe_callback(struct dp_soc *dp_soc, void *cb_context,
QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t), QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t),

47
dp/wifi3.0/dp_main.c
View File

@@ -506,26 +506,6 @@ static void dp_pkt_log_con_service(struct cdp_soc_t *soc_hdl,
pktlog_htc_attach(); pktlog_htc_attach();
} }
/**
* dp_get_num_rx_contexts() - get number of RX contexts
* @soc_hdl: cdp opaque soc handle
*
* Return: number of RX contexts
*/
static int dp_get_num_rx_contexts(struct cdp_soc_t *soc_hdl)
{
int i;
int num_rx_contexts = 0;
struct dp_soc *soc = (struct dp_soc *)soc_hdl;
for (i = 0; i < wlan_cfg_get_num_contexts(soc->wlan_cfg_ctx); i++)
if (wlan_cfg_get_rx_ring_mask(soc->wlan_cfg_ctx, i))
num_rx_contexts++;
return num_rx_contexts;
}
/** /**
* dp_pktlogmod_exit() - API to cleanup pktlog info * dp_pktlogmod_exit() - API to cleanup pktlog info
* @pdev: Pdev handle * @pdev: Pdev handle
@@ -550,7 +530,34 @@ static void dp_pktlogmod_exit(struct dp_pdev *pdev)
pktlogmod_exit(scn); pktlogmod_exit(scn);
pdev->pkt_log_init = false; pdev->pkt_log_init = false;
} }
#else
static void dp_pkt_log_con_service(struct cdp_soc_t *soc_hdl,
uint8_t pdev_id, void *scn)
{
}
static void dp_pktlogmod_exit(struct dp_pdev *handle) { }
#endif #endif
/**
* dp_get_num_rx_contexts() - get number of RX contexts
* @soc_hdl: cdp opaque soc handle
*
* Return: number of RX contexts
*/
static int dp_get_num_rx_contexts(struct cdp_soc_t *soc_hdl)
{
int i;
int num_rx_contexts = 0;
struct dp_soc *soc = (struct dp_soc *)soc_hdl;
for (i = 0; i < wlan_cfg_get_num_contexts(soc->wlan_cfg_ctx); i++)
if (wlan_cfg_get_rx_ring_mask(soc->wlan_cfg_ctx, i))
num_rx_contexts++;
return num_rx_contexts;
}
#else #else
static void dp_pktlogmod_exit(struct dp_pdev *handle) { } static void dp_pktlogmod_exit(struct dp_pdev *handle) { }

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

@@ -4418,6 +4418,7 @@ void dp_peer_stats_update_protocol_cnt(struct cdp_soc_t *soc,
} }
#endif #endif
#ifdef WDI_EVENT_ENABLE
QDF_STATUS dp_peer_stats_notify(struct dp_pdev *dp_pdev, struct dp_peer *peer) QDF_STATUS dp_peer_stats_notify(struct dp_pdev *dp_pdev, struct dp_peer *peer)
{ {
struct cdp_interface_peer_stats peer_stats_intf; struct cdp_interface_peer_stats peer_stats_intf;
@@ -4452,6 +4453,7 @@ QDF_STATUS dp_peer_stats_notify(struct dp_pdev *dp_pdev, struct dp_peer *peer)
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
#endif
#ifdef QCA_ENH_V3_STATS_SUPPORT #ifdef QCA_ENH_V3_STATS_SUPPORT
/** /**

4
dp/wifi3.0/dp_types.h
View File

@@ -115,13 +115,11 @@
#define PHYB_2G_LMAC_ID 2 #define PHYB_2G_LMAC_ID 2
#define PHYB_2G_TARGET_PDEV_ID 2 #define PHYB_2G_TARGET_PDEV_ID 2
#ifndef REMOVE_PKT_LOG
enum rx_pktlog_mode { enum rx_pktlog_mode {
DP_RX_PKTLOG_DISABLED = 0, DP_RX_PKTLOG_DISABLED = 0,
DP_RX_PKTLOG_FULL, DP_RX_PKTLOG_FULL,
DP_RX_PKTLOG_LITE, DP_RX_PKTLOG_LITE,
}; };
#endif
/* enum m_copy_mode - Available mcopy mode /* enum m_copy_mode - Available mcopy mode
* *
@@ -1749,10 +1747,8 @@ struct dp_pdev {
/* map this pdev to a particular Reo Destination ring */ /* map this pdev to a particular Reo Destination ring */
enum cdp_host_reo_dest_ring reo_dest; enum cdp_host_reo_dest_ring reo_dest;
#ifndef REMOVE_PKT_LOG
/* Packet log mode */ /* Packet log mode */
uint8_t rx_pktlog_mode; uint8_t rx_pktlog_mode;
#endif
/* WDI event handlers */ /* WDI event handlers */
struct wdi_event_subscribe_t **wdi_event_list; struct wdi_event_subscribe_t **wdi_event_list;