浏览代码

qcacmn: Disable deprecated monitor functions

Disable deprecated monitor feature functions
in wkk.

Change-Id: I2ef2f6219d95a2728452faffafe9f20a30eb28d8
CRs-Fixed: 3243020
Jeevan Kukkalli 3 年之前
父节点
当前提交
9f2e4a34b8

+ 10 - 15
dp/wifi3.0/monitor/2.0/dp_mon_2.0.c

@@ -1273,11 +1273,9 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc)
 	mon_ops->mon_htt_ppdu_stats_detach = dp_htt_ppdu_stats_detach;
 	mon_ops->mon_print_pdev_rx_mon_stats = dp_print_pdev_rx_mon_stats;
 	mon_ops->mon_set_bsscolor = dp_mon_set_bsscolor;
-	mon_ops->mon_pdev_get_filter_ucast_data =
-				dp_pdev_get_filter_ucast_data;
-	mon_ops->mon_pdev_get_filter_mcast_data =
-				dp_pdev_get_filter_mcast_data;
-	mon_ops->mon_pdev_get_filter_non_data = dp_pdev_get_filter_non_data;
+	mon_ops->mon_pdev_get_filter_ucast_data = NULL;
+	mon_ops->mon_pdev_get_filter_mcast_data = NULL;
+	mon_ops->mon_pdev_get_filter_non_data = NULL;
 	mon_ops->mon_neighbour_peer_add_ast = NULL;
 #ifndef DISABLE_MON_CONFIG
 	mon_ops->mon_tx_process = dp_tx_mon_process_2_0;
@@ -1306,19 +1304,17 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc)
 	mon_ops->mon_set_bpr_enable = dp_set_bpr_enable_2_0;
 #endif
 #ifdef ATH_SUPPORT_NAC
-	mon_ops->mon_set_filter_neigh_peers = dp_set_filter_neigh_peers;
+	mon_ops->mon_set_filter_neigh_peers = NULL;
 #endif
 #ifdef WLAN_ATF_ENABLE
 	mon_ops->mon_set_atf_stats_enable = dp_set_atf_stats_enable;
 #endif
 #ifdef FEATURE_NAC_RSSI
-	mon_ops->mon_filter_neighbour_peer = dp_filter_neighbour_peer;
+	mon_ops->mon_filter_neighbour_peer = NULL;
 #endif
 #ifdef QCA_MCOPY_SUPPORT
-	mon_ops->mon_filter_setup_mcopy_mode =
-				dp_mon_filter_setup_mcopy_mode_2_0;
-	mon_ops->mon_filter_reset_mcopy_mode =
-				dp_mon_filter_reset_mcopy_mode_2_0;
+	mon_ops->mon_filter_setup_mcopy_mode = NULL;
+	mon_ops->mon_filter_reset_mcopy_mode = NULL;
 	mon_ops->mon_mcopy_check_deliver = NULL;
 #endif
 #ifdef QCA_ENHANCED_STATS_SUPPORT
@@ -1339,8 +1335,7 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc)
 #endif
 #endif
 #ifdef WLAN_RX_PKT_CAPTURE_ENH
-	mon_ops->mon_filter_setup_rx_enh_capture =
-				dp_mon_filter_setup_rx_enh_capture_2_0;
+	mon_ops->mon_filter_setup_rx_enh_capture = NULL;
 #endif
 #ifdef WDI_EVENT_ENABLE
 	mon_ops->mon_set_pktlog_wifi3 = dp_set_pktlog_wifi3;
@@ -1369,7 +1364,7 @@ dp_mon_register_feature_ops_2_0(struct dp_soc *soc)
 	mon_ops->rx_mon_enable = dp_rx_mon_enable_set;
 	mon_ops->rx_wmask_subscribe = dp_rx_mon_word_mask_subscribe;
 	mon_ops->rx_enable_mpdu_logging = dp_rx_mon_enable_mpdu_logging;
-	mon_ops->mon_neighbour_peers_detach = dp_neighbour_peers_detach;
+	mon_ops->mon_neighbour_peers_detach = NULL;
 	mon_ops->mon_vdev_set_monitor_mode_buf_rings =
 				dp_vdev_set_monitor_mode_buf_rings_2_0;
 	mon_ops->mon_vdev_set_monitor_mode_rings =
@@ -1481,7 +1476,7 @@ struct dp_mon_ops monitor_ops_2_0 = {
 struct cdp_mon_ops dp_ops_mon_2_0 = {
 	.txrx_reset_monitor_mode = dp_reset_monitor_mode,
 	/* Added support for HK advance filter */
-	.txrx_set_advance_monitor_filter = dp_pdev_set_advance_monitor_filter,
+	.txrx_set_advance_monitor_filter = NULL,
 	.txrx_deliver_tx_mgmt = dp_deliver_tx_mgmt,
 	.config_full_mon_mode = NULL,
 	.soc_config_full_mon_mode = NULL,

+ 0 - 22
dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c

@@ -122,13 +122,11 @@ fail:
 void dp_rx_mon_hdr_length_set(uint32_t *msg_word,
 			      struct htt_rx_ring_tlv_filter *tlv_filter)
 {
-#ifdef FW_SUPPORT_NOT_YET
 	if (!msg_word || !tlv_filter)
 		return;
 
 	HTT_RX_RING_SELECTION_CFG_RX_HDR_LEN_SET(*msg_word,
 						 tlv_filter->rx_hdr_length);
-#endif
 }
 
 void dp_rx_mon_packet_length_set(uint32_t *msg_word,
@@ -1144,26 +1142,6 @@ dp_mon_filter_reset_undecoded_metadata_capture_2_0(struct dp_pdev *pdev)
 }
 #endif
 
-#ifdef QCA_MCOPY_SUPPORT
-void dp_mon_filter_setup_mcopy_mode_2_0(struct dp_pdev *pdev)
-{
-}
-
-void dp_mon_filter_reset_mcopy_mode_2_0(struct dp_pdev *pdev)
-{
-}
-#endif
-
-#ifdef WLAN_RX_PKT_CAPTURE_ENH
-void dp_mon_filter_setup_rx_enh_capture_2_0(struct dp_pdev *pdev)
-{
-}
-
-void dp_mon_filter_reset_rx_enh_capture_2_0(struct dp_pdev *pdev)
-{
-}
-#endif /* WLAN_RX_PKT_CAPTURE_ENH */
-
 void dp_tx_mon_filter_set_downstream_tlvs(struct htt_tx_ring_tlv_filter *filter)
 {
 	filter->dtlvs.tx_fes_setup = 1;

+ 0 - 48
dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.h

@@ -135,54 +135,6 @@ dp_mon_filter_reset_undecoded_metadata_capture_2_0(struct dp_pdev *pdev)
 }
 #endif
 
-#ifdef QCA_MCOPY_SUPPORT
-/**
- * dp_mon_filter_setup_mcopy_mode() - Setup the m_copy mode filter
- * @pdev: DP pdev handle
- */
-void dp_mon_filter_setup_mcopy_mode_2_0(struct dp_pdev *pdev);
-
-/**
- * dp_mon_filter_reset_mcopy_mode() - Reset the m_copy mode filter
- * @pdev: DP pdev handle
- */
-void dp_mon_filter_reset_mcopy_mode_2_0(struct dp_pdev *pdev);
-#else
-static inline void
-dp_mon_filter_setup_mcopy_mode_2_0(struct dp_pdev *pdev)
-{
-}
-
-static inline void
-dp_mon_filter_reset_mcopy_mode_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
- * @pdev: DP pdev handle
- */
-void dp_mon_filter_setup_rx_enh_capture_2_0(struct dp_pdev *pdev);
-
-/**
- * dp_mon_filter_reset_rx_enh_capture() - Reset the Rx capture mode filters
- * @pdev: DP pdev handle
- */
-void dp_mon_filter_reset_rx_enh_capture_2_0(struct dp_pdev *pdev);
-#else
-static inline void
-dp_mon_filter_setup_rx_enh_capture_2_0(struct dp_pdev *pdev)
-{
-}
-
-static inline void
-dp_mon_filter_reset_rx_enh_capture_2_0(struct dp_pdev *pdev)
-{
-}
-#endif
-
 /**
  * dp_mon_filter_setup_rx_mon_mode() - Setup the Rx monitor mode filter
  * @pdev: DP pdev handle