diff --git a/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c b/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c index 1170b8744d..eb64c30305 100644 --- a/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c +++ b/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c @@ -1259,10 +1259,6 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc) mon_ops->mon_ppdu_desc_notify = dp_ppdu_desc_notify_2_0; #endif #endif -#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC) - mon_ops->mon_filter_setup_smart_monitor = - dp_mon_filter_setup_smart_monitor_2_0; -#endif #ifdef WLAN_RX_PKT_CAPTURE_ENH mon_ops->mon_filter_setup_rx_enh_capture = dp_mon_filter_setup_rx_enh_capture_2_0; diff --git a/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c b/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c index 86fa1bc1f1..be7531349e 100644 --- a/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c +++ b/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c @@ -1128,16 +1128,6 @@ void dp_mon_filter_reset_mcopy_mode_2_0(struct dp_pdev *pdev) } #endif -#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC) -void dp_mon_filter_setup_smart_monitor_2_0(struct dp_pdev *pdev) -{ -} - -void dp_mon_filter_reset_smart_monitor_2_0(struct dp_pdev *pdev) -{ -} -#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */ - #ifdef WLAN_RX_PKT_CAPTURE_ENH void dp_mon_filter_setup_rx_enh_capture_2_0(struct dp_pdev *pdev) { diff --git a/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.h b/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.h index b5c73e244f..873e2312d5 100644 --- a/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.h +++ b/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.h @@ -159,30 +159,6 @@ dp_mon_filter_reset_mcopy_mode_2_0(struct dp_pdev *pdev) } #endif -#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC) -/** - * dp_mon_filter_setup_smart_monitor() - Setup the smart monitor mode filter - * @pdev: DP pdev handle - */ -void dp_mon_filter_setup_smart_monitor_2_0(struct dp_pdev *pdev); - -/** - * dp_mon_filter_reset_smart_monitor() - Reset the smart monitor mode filter - * @pdev: DP pdev handle - */ -void dp_mon_filter_reset_smart_monitor_2_0(struct dp_pdev *pdev); -#else -static inline void -dp_mon_filter_setup_smart_monitor_2_0(struct dp_pdev *pdev) -{ -} - -static inline void -dp_mon_filter_reset_smart_monitor_2_0(struct dp_pdev *pdev) -{ -} -#endif - #ifdef WLAN_RX_PKT_CAPTURE_ENH /** * dp_mon_filter_setup_rx_enh_capture() - Setup the Rx capture mode filters diff --git a/dp/wifi3.0/monitor/dp_mon.c b/dp/wifi3.0/monitor/dp_mon.c index 325ae9c7cb..6e9c3d68c3 100644 --- a/dp/wifi3.0/monitor/dp_mon.c +++ b/dp/wifi3.0/monitor/dp_mon.c @@ -34,6 +34,9 @@ #ifdef FEATURE_PERPKT_INFO #include "dp_ratetable.h" #endif +#ifdef QCA_SUPPORT_LITE_MONITOR +#include "dp_lite_mon.h" +#endif #define DP_INTR_POLL_TIMER_MS 5 #define INVALID_FREE_BUFF 0xffffffff @@ -5482,10 +5485,30 @@ void dp_mon_cdp_ops_register(struct dp_soc *soc) case TARGET_TYPE_QCA5018: case TARGET_TYPE_QCN6122: dp_mon_cdp_ops_register_1_0(ops); +#ifdef ATH_SUPPORT_NAC_RSSI + ops->ctrl_ops->txrx_vdev_config_for_nac_rssi = + dp_config_for_nac_rssi; + ops->ctrl_ops->txrx_vdev_get_neighbour_rssi = + dp_vdev_get_neighbour_rssi; +#endif +#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC) + ops->ctrl_ops->txrx_update_filter_neighbour_peers = + dp_update_filter_neighbour_peers; +#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */ break; case TARGET_TYPE_QCN9224: #ifdef QCA_MONITOR_2_0_SUPPORT dp_mon_cdp_ops_register_2_0(ops); +#ifdef ATH_SUPPORT_NAC_RSSI + ops->ctrl_ops->txrx_vdev_config_for_nac_rssi = + dp_lite_mon_config_nac_rssi_peer; + ops->ctrl_ops->txrx_vdev_get_neighbour_rssi = + dp_lite_mon_get_nac_peer_rssi; +#endif +#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC) + ops->ctrl_ops->txrx_update_filter_neighbour_peers = + dp_lite_mon_config_nac_peer; +#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */ #endif break; default: @@ -5505,15 +5528,6 @@ void dp_mon_cdp_ops_register(struct dp_soc *soc) ops->misc_ops->pkt_log_con_service = dp_pkt_log_con_service; ops->misc_ops->pkt_log_exit = dp_pkt_log_exit; #endif -#ifdef ATH_SUPPORT_NAC_RSSI - ops->ctrl_ops->txrx_vdev_config_for_nac_rssi = dp_config_for_nac_rssi; - ops->ctrl_ops->txrx_vdev_get_neighbour_rssi = - dp_vdev_get_neighbour_rssi; -#endif -#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC) - ops->ctrl_ops->txrx_update_filter_neighbour_peers = - dp_update_filter_neighbour_peers; -#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */ ops->ctrl_ops->enable_peer_based_pktlog = dp_enable_peer_based_pktlog; #if defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(WLAN_RX_PKT_CAPTURE_ENH) diff --git a/dp/wifi3.0/monitor/dp_mon.h b/dp/wifi3.0/monitor/dp_mon.h index b76038b9a2..880f9d3097 100644 --- a/dp/wifi3.0/monitor/dp_mon.h +++ b/dp/wifi3.0/monitor/dp_mon.h @@ -4028,5 +4028,31 @@ static inline void dp_lite_mon_vdev_delete(struct dp_pdev *pdev, struct dp_vdev *vdev) { } + +static inline int +dp_lite_mon_config_nac_peer(struct cdp_soc_t *soc_hdl, + uint8_t vdev_id, + uint32_t cmd, uint8_t *macaddr) +{ + return 0; +} + +static inline QDF_STATUS +dp_lite_mon_config_nac_rssi_peer(struct cdp_soc_t *soc_hdl, + uint8_t vdev_id, + enum cdp_nac_param_cmd cmd, + char *bssid, char *macaddr, + uint8_t chan_num) +{ + return QDF_STATUS_E_FAILURE; +} + +static inline QDF_STATUS +dp_lite_mon_get_nac_peer_rssi(struct cdp_soc_t *soc_hdl, + uint8_t vdev_id, char *macaddr, + uint8_t *rssi) +{ + return QDF_STATUS_E_FAILURE; +} #endif #endif /* _DP_MON_H_ */