diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h index 4cb9373a40..8d9bd013dd 100644 --- a/dp/wifi3.0/dp_internal.h +++ b/dp/wifi3.0/dp_internal.h @@ -600,11 +600,6 @@ dp_monitor_get_rx_status(struct dp_pdev *pdev) return NULL; } -static inline bool dp_monitor_is_enable_enhanced_stats(struct dp_pdev *pdev) -{ - return false; -} - static inline void dp_monitor_pdev_config_scan_spcl_vap(struct dp_pdev *pdev) { diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index e972082696..bb1c9a30c7 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -2010,7 +2010,7 @@ dp_tx_send_msdu_single(struct dp_vdev *vdev, qdf_nbuf_t nbuf, HTT_TX_TCL_METADATA_VALID_HTT_SET(htt_tcl_metadata, 1); dp_tx_desc_update_fast_comp_flag(soc, tx_desc, - !dp_monitor_is_enable_enhanced_stats(pdev)); + !pdev->enhanced_stats_en); dp_tx_update_mesh_flags(soc, vdev, tx_desc); @@ -3855,7 +3855,7 @@ static inline void dp_tx_sojourn_stats_process(struct dp_pdev *pdev, uint64_t delta_ms; struct cdp_tx_sojourn_stats *sojourn_stats; - if (qdf_unlikely(!dp_monitor_is_enable_enhanced_stats(pdev))) + if (qdf_unlikely(!pdev->enhanced_stats_en)) return; if (qdf_unlikely(tid == HTT_INVALID_TID || diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h index 5e4637487a..7ee70112e2 100644 --- a/dp/wifi3.0/dp_types.h +++ b/dp/wifi3.0/dp_types.h @@ -2429,6 +2429,9 @@ struct dp_pdev { /* Global RX decap mode for the device */ enum htt_pkt_type rx_decap_mode; + /* Enhanced Stats is enabled */ + bool enhanced_stats_en; + qdf_atomic_t num_tx_outstanding; int32_t tx_descs_max; diff --git a/dp/wifi3.0/monitor/dp_mon.c b/dp/wifi3.0/monitor/dp_mon.c index b4bbcad26f..9585bb3c80 100644 --- a/dp/wifi3.0/monitor/dp_mon.c +++ b/dp/wifi3.0/monitor/dp_mon.c @@ -4825,6 +4825,7 @@ dp_enable_enhanced_stats(struct cdp_soc_t *soc, uint8_t pdev_id) return QDF_STATUS_E_FAILURE; } + pdev->enhanced_stats_en = true; if (is_ppdu_txrx_capture_enabled(pdev) && !mon_pdev->bpr_enable) { dp_h2t_cfg_stats_msg_send(pdev, DP_PPDU_STATS_CFG_ENH_STATS, pdev->pdev_id); @@ -4863,6 +4864,7 @@ dp_disable_enhanced_stats(struct cdp_soc_t *soc, uint8_t pdev_id) dp_cal_client_timer_stop(mon_pdev->cal_client_ctx); mon_pdev->enhanced_stats_en = 0; + pdev->enhanced_stats_en = false; if (is_ppdu_txrx_capture_enabled(pdev) && !mon_pdev->bpr_enable) { dp_h2t_cfg_stats_msg_send(pdev, 0, pdev->pdev_id); diff --git a/dp/wifi3.0/monitor/dp_mon.h b/dp/wifi3.0/monitor/dp_mon.h index 29a1ee1d47..314a9d70cd 100644 --- a/dp/wifi3.0/monitor/dp_mon.h +++ b/dp/wifi3.0/monitor/dp_mon.h @@ -842,20 +842,6 @@ static inline void dp_monitor_print_tx_stats(struct dp_pdev *pdev) pdev->monitor_pdev->list_depth); } -/* - * dp_monitor_is_enable_enhanced_stats() - check if enhanced stats enabled - * @pdev: point to dp pdev - * - * Return: true if enhanced stats is enabled - */ -static inline bool dp_monitor_is_enable_enhanced_stats(struct dp_pdev *pdev) -{ - if (qdf_unlikely(!pdev || !pdev->monitor_pdev)) - return false; - - return pdev->monitor_pdev->enhanced_stats_en; -} - /* * dp_monitor_set_chan_num() - set channel number * @pdev: point to dp pdev