qcacmn: Move smart monitor cdp func ptrs to mon ops structure

Move smart monitor cdp func ptrs to cdp mon ops structure.
Smart monitor cdp functions are different for 1.0 and 2.0
hence moving the func ptrs to mon ops structure ensures that
func ptrs are initialized appropriately.

Change-Id: Ic827b44f36d76349f397e5b72dec0a127f90aa7a
CRs-Fixed: 3428778

dp/inc/cdp_txrx_ctrl.h

@@ -88,11 +88,11 @@ cdp_update_filter_neighbour_peers(ol_txrx_soc_handle soc,
 		return 0;
 	}
 
-	if (!soc->ops->ctrl_ops ||
-	    !soc->ops->ctrl_ops->txrx_update_filter_neighbour_peers)
+	if (!soc->ops->mon_ops ||
+	    !soc->ops->mon_ops->txrx_update_filter_neighbour_peers)
 		return 0;
 
-	return soc->ops->ctrl_ops->txrx_update_filter_neighbour_peers
+	return soc->ops->mon_ops->txrx_update_filter_neighbour_peers
 			(soc, vdev_id, cmd, macaddr);
 }
 #endif /* ATH_SUPPORT_NAC || ATH_SUPPORT_NAC_RSSI*/
@@ -1153,11 +1153,11 @@ static inline QDF_STATUS cdp_vdev_config_for_nac_rssi(ol_txrx_soc_handle soc,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!soc->ops->ctrl_ops ||
-			!soc->ops->ctrl_ops->txrx_vdev_config_for_nac_rssi)
+	if (!soc->ops->mon_ops ||
+			!soc->ops->mon_ops->txrx_vdev_config_for_nac_rssi)
 		return QDF_STATUS_E_FAILURE;
 
-	return soc->ops->ctrl_ops->txrx_vdev_config_for_nac_rssi(soc, vdev_id,
+	return soc->ops->mon_ops->txrx_vdev_config_for_nac_rssi(soc, vdev_id,
 			nac_cmd, bssid, client_macaddr, chan_num);
 }
 
@@ -1182,11 +1182,11 @@ static inline QDF_STATUS cdp_vdev_get_neighbour_rssi(ol_txrx_soc_handle soc,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!soc->ops->ctrl_ops ||
-	    !soc->ops->ctrl_ops->txrx_vdev_get_neighbour_rssi)
+	if (!soc->ops->mon_ops ||
+	    !soc->ops->mon_ops->txrx_vdev_get_neighbour_rssi)
 		return QDF_STATUS_E_FAILURE;
 
-	return soc->ops->ctrl_ops->txrx_vdev_get_neighbour_rssi(soc, vdev_id,
+	return soc->ops->mon_ops->txrx_vdev_get_neighbour_rssi(soc, vdev_id,
 								macaddr,
 								rssi);
 }

dp/inc/cdp_txrx_ops.h

@@ -728,10 +728,6 @@ struct cdp_ctrl_ops {
 
 	int
 		(*txrx_mempools_attach)(ol_txrx_soc_handle dp_soc);
-	int
-		(*txrx_update_filter_neighbour_peers)(
-				struct cdp_soc_t *soc, uint8_t vdev_id,
-				uint32_t cmd, uint8_t *macaddr);
 
 	/* Is this similar to ol_txrx_peer_state_update() in MCL */
 	/**
@@ -852,19 +848,6 @@ struct cdp_ctrl_ops {
 				       bool is_egress,
 				       bool is_rx);
 #endif
-#ifdef ATH_SUPPORT_NAC_RSSI
-	QDF_STATUS (*txrx_vdev_config_for_nac_rssi)(struct cdp_soc_t *cdp_soc,
-						    uint8_t vdev_id,
-						    enum cdp_nac_param_cmd cmd,
-						    char *bssid,
-						    char *client_macaddr,
-						    uint8_t chan_num);
-
-	QDF_STATUS (*txrx_vdev_get_neighbour_rssi)(struct cdp_soc_t *cdp_soc,
-						   uint8_t vdev_id,
-						   char *macaddr,
-						   uint8_t *rssi);
-#endif
 
 #ifdef WLAN_SUPPORT_MSCS
 	QDF_STATUS
@@ -992,6 +975,9 @@ struct cdp_me_ops {
  * @soc_config_full_mon_mode: pdev configure full monitor mode
  * @get_mon_pdev_rx_stats: Get monitor mode pdev stats
  * @txrx_enable_mon_reap_timer: Enable/Disable reap timer of monitor status ring
+ * @txrx_update_filter_neighbour_peers: config nac peer
+ * @txrx_vdev_config_for_nac_rssi: config nac rssi peer
+ * @txrx_vdev_get_neighbour_rssi: get nac peer rssi
  * @txrx_set_lite_mon_config:  set lite monitor config
  * @txrx_get_lite_mon_config:  get lite monitor config
  * @txrx_set_lite_mon_peer_config: set lite monitor peer config
@@ -1036,6 +1022,25 @@ struct cdp_mon_ops {
 	QDF_STATUS (*txrx_disable_enhanced_stats)(struct cdp_soc_t *soc,
 						  uint8_t pdev_id);
 
+	int
+		(*txrx_update_filter_neighbour_peers)(
+				struct cdp_soc_t *soc, uint8_t vdev_id,
+				uint32_t cmd, uint8_t *macaddr);
+
+#ifdef ATH_SUPPORT_NAC_RSSI
+	QDF_STATUS (*txrx_vdev_config_for_nac_rssi)(struct cdp_soc_t *cdp_soc,
+						    uint8_t vdev_id,
+						    enum cdp_nac_param_cmd cmd,
+						    char *bssid,
+						    char *client_macaddr,
+						    uint8_t chan_num);
+
+	QDF_STATUS (*txrx_vdev_get_neighbour_rssi)(struct cdp_soc_t *cdp_soc,
+						   uint8_t vdev_id,
+						   char *macaddr,
+						   uint8_t *rssi);
+#endif
+
 #ifdef QCA_SUPPORT_LITE_MONITOR
 	QDF_STATUS
 	(*txrx_set_lite_mon_config)(

dp/wifi3.0/monitor/1.0/dp_mon_1.0.c

@@ -1067,6 +1067,203 @@ static void dp_mon_register_intr_ops_1_0(struct dp_soc *soc)
 }
 #endif
 
+#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC)
+/*
+ * dp_update_filter_neighbour_peers() - set neighbour peers(nac clients)
+ * address for smart mesh filtering
+ * @txrx_soc: cdp soc handle
+ * @vdev_id: id of virtual device object
+ * @cmd: Add/Del command
+ * @macaddr: nac client mac address
+ *
+ * Return: success/failure
+ */
+static int dp_update_filter_neighbour_peers(struct cdp_soc_t *soc_hdl,
+					    uint8_t vdev_id,
+					    uint32_t cmd, uint8_t *macaddr)
+{
+	struct dp_soc *soc = (struct dp_soc *)soc_hdl;
+	struct dp_pdev *pdev;
+	struct dp_neighbour_peer *peer = NULL;
+	struct dp_vdev *vdev = dp_vdev_get_ref_by_id(soc, vdev_id,
+						     DP_MOD_ID_CDP);
+	struct dp_mon_pdev *mon_pdev;
+
+	if (!vdev || !macaddr)
+		goto fail0;
+
+	pdev = vdev->pdev;
+
+	if (!pdev)
+		goto fail0;
+
+	mon_pdev = pdev->monitor_pdev;
+
+	/* Store address of NAC (neighbour peer) which will be checked
+	 * against TA of received packets.
+	 */
+	if (cmd == DP_NAC_PARAM_ADD) {
+		peer = (struct dp_neighbour_peer *)qdf_mem_malloc(
+				sizeof(*peer));
+
+		if (!peer) {
+			dp_cdp_err("%pK: DP neighbour peer node memory allocation failed"
+				   , soc);
+			goto fail0;
+		}
+
+		qdf_mem_copy(&peer->neighbour_peers_macaddr.raw[0],
+			     macaddr, QDF_MAC_ADDR_SIZE);
+		peer->vdev = vdev;
+
+		qdf_spin_lock_bh(&mon_pdev->neighbour_peer_mutex);
+
+		/* add this neighbour peer into the list */
+		TAILQ_INSERT_TAIL(&mon_pdev->neighbour_peers_list, peer,
+				  neighbour_peer_list_elem);
+		qdf_spin_unlock_bh(&mon_pdev->neighbour_peer_mutex);
+
+		/* first neighbour */
+		if (!mon_pdev->neighbour_peers_added) {
+			QDF_STATUS status = QDF_STATUS_SUCCESS;
+
+			mon_pdev->neighbour_peers_added = true;
+			dp_mon_filter_setup_smart_monitor(pdev);
+			status = dp_mon_filter_update(pdev);
+			if (status != QDF_STATUS_SUCCESS) {
+				dp_cdp_err("%pK: smart mon filter setup failed",
+					   soc);
+				dp_mon_filter_reset_smart_monitor(pdev);
+				mon_pdev->neighbour_peers_added = false;
+			}
+		}
+
+	} else if (cmd == DP_NAC_PARAM_DEL) {
+		qdf_spin_lock_bh(&mon_pdev->neighbour_peer_mutex);
+		TAILQ_FOREACH(peer, &mon_pdev->neighbour_peers_list,
+			      neighbour_peer_list_elem) {
+			if (!qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0],
+					 macaddr, QDF_MAC_ADDR_SIZE)) {
+				/* delete this peer from the list */
+				TAILQ_REMOVE(&mon_pdev->neighbour_peers_list,
+					     peer, neighbour_peer_list_elem);
+				qdf_mem_free(peer);
+				break;
+			}
+		}
+		/* last neighbour deleted */
+		if (TAILQ_EMPTY(&mon_pdev->neighbour_peers_list)) {
+			QDF_STATUS status = QDF_STATUS_SUCCESS;
+
+			dp_mon_filter_reset_smart_monitor(pdev);
+			status = dp_mon_filter_update(pdev);
+			if (status != QDF_STATUS_SUCCESS) {
+				dp_cdp_err("%pK: smart mon filter clear failed",
+					   soc);
+			}
+			mon_pdev->neighbour_peers_added = false;
+		}
+		qdf_spin_unlock_bh(&mon_pdev->neighbour_peer_mutex);
+	}
+	dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
+	return 1;
+
+fail0:
+	if (vdev)
+		dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
+	return 0;
+}
+#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */
+
+#ifdef ATH_SUPPORT_NAC_RSSI
+/**
+ * dp_vdev_get_neighbour_rssi(): Store RSSI for configured NAC
+ * @soc_hdl: DP soc handle
+ * @vdev_id: id of DP vdev handle
+ * @mac_addr: neighbour mac
+ * @rssi: rssi value
+ *
+ * Return: 0 for success. nonzero for failure.
+ */
+static QDF_STATUS  dp_vdev_get_neighbour_rssi(struct cdp_soc_t *soc_hdl,
+					      uint8_t vdev_id,
+					      char *mac_addr,
+					      uint8_t *rssi)
+{
+	struct dp_soc *soc = cdp_soc_t_to_dp_soc(soc_hdl);
+	struct dp_vdev *vdev = dp_vdev_get_ref_by_id(soc, vdev_id,
+						     DP_MOD_ID_CDP);
+	struct dp_pdev *pdev;
+	struct dp_neighbour_peer *peer = NULL;
+	QDF_STATUS status = QDF_STATUS_E_FAILURE;
+	struct dp_mon_pdev *mon_pdev;
+
+	if (!vdev)
+		return status;
+
+	pdev = vdev->pdev;
+	mon_pdev = pdev->monitor_pdev;
+
+	*rssi = 0;
+	qdf_spin_lock_bh(&mon_pdev->neighbour_peer_mutex);
+	TAILQ_FOREACH(peer, &mon_pdev->neighbour_peers_list,
+		      neighbour_peer_list_elem) {
+		if (qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0],
+				mac_addr, QDF_MAC_ADDR_SIZE) == 0) {
+			*rssi = peer->rssi;
+			status = QDF_STATUS_SUCCESS;
+			break;
+		}
+	}
+	qdf_spin_unlock_bh(&mon_pdev->neighbour_peer_mutex);
+	dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
+	return status;
+}
+
+static QDF_STATUS
+dp_config_for_nac_rssi(struct cdp_soc_t *cdp_soc,
+		       uint8_t vdev_id,
+		       enum cdp_nac_param_cmd cmd, char *bssid,
+		       char *client_macaddr,
+		       uint8_t chan_num)
+{
+	struct dp_soc *soc = (struct dp_soc *)cdp_soc;
+	struct dp_vdev *vdev = dp_vdev_get_ref_by_id(soc, vdev_id,
+						     DP_MOD_ID_CDP);
+	struct dp_pdev *pdev;
+	struct dp_mon_pdev *mon_pdev;
+
+	if (!vdev)
+		return QDF_STATUS_E_FAILURE;
+
+	pdev = (struct dp_pdev *)vdev->pdev;
+
+	mon_pdev = pdev->monitor_pdev;
+	mon_pdev->nac_rssi_filtering = 1;
+	/* Store address of NAC (neighbour peer) which will be checked
+	 * against TA of received packets.
+	 */
+
+	if (cmd == CDP_NAC_PARAM_ADD) {
+		dp_update_filter_neighbour_peers(cdp_soc, vdev->vdev_id,
+						 DP_NAC_PARAM_ADD,
+						 (uint8_t *)client_macaddr);
+	} else if (cmd == CDP_NAC_PARAM_DEL) {
+		dp_update_filter_neighbour_peers(cdp_soc, vdev->vdev_id,
+						 DP_NAC_PARAM_DEL,
+						 (uint8_t *)client_macaddr);
+	}
+
+	if (soc->cdp_soc.ol_ops->config_bssid_in_fw_for_nac_rssi)
+		soc->cdp_soc.ol_ops->config_bssid_in_fw_for_nac_rssi
+			(soc->ctrl_psoc, pdev->pdev_id,
+			 vdev->vdev_id, cmd, bssid, client_macaddr);
+
+	dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
+	return QDF_STATUS_SUCCESS;
+}
+#endif
+
 /**
  * dp_mon_register_feature_ops_1_0() - register feature ops
  *
@@ -1317,6 +1514,13 @@ struct cdp_mon_ops dp_ops_mon_1_0 = {
 	.txrx_enable_enhanced_stats = dp_enable_enhanced_stats,
 	.txrx_disable_enhanced_stats = dp_disable_enhanced_stats,
 #endif /* QCA_ENHANCED_STATS_SUPPORT */
+#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC)
+	.txrx_update_filter_neighbour_peers = dp_update_filter_neighbour_peers,
+#endif
+#ifdef ATH_SUPPORT_NAC_RSSI
+	.txrx_vdev_config_for_nac_rssi = dp_config_for_nac_rssi,
+	.txrx_vdev_get_neighbour_rssi = dp_vdev_get_neighbour_rssi,
+#endif
 #ifdef QCA_SUPPORT_LITE_MONITOR
 	.txrx_set_lite_mon_config = NULL,
 	.txrx_get_lite_mon_config = NULL,

dp/wifi3.0/monitor/2.0/dp_mon_2.0.c

@@ -1668,6 +1668,13 @@ struct cdp_mon_ops dp_ops_mon_2_0 = {
 	.txrx_enable_enhanced_stats = dp_enable_enhanced_stats_2_0,
 	.txrx_disable_enhanced_stats = dp_disable_enhanced_stats_2_0,
 #endif /* QCA_ENHANCED_STATS_SUPPORT */
+#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC)
+	.txrx_update_filter_neighbour_peers = dp_lite_mon_config_nac_peer,
+#endif
+#ifdef ATH_SUPPORT_NAC_RSSI
+	.txrx_vdev_config_for_nac_rssi = dp_lite_mon_config_nac_rssi_peer,
+	.txrx_vdev_get_neighbour_rssi = dp_lite_mon_get_nac_peer_rssi,
+#endif
 #ifdef QCA_SUPPORT_LITE_MONITOR
 	.txrx_set_lite_mon_config = dp_lite_mon_set_config,
 	.txrx_get_lite_mon_config = dp_lite_mon_get_config,

dp/wifi3.0/monitor/dp_mon.c

@@ -1560,114 +1560,6 @@ QDF_STATUS dp_filter_neighbour_peer(struct dp_pdev *pdev,
 }
 #endif
 
-#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC)
-/**
- * dp_update_filter_neighbour_peers() - set neighbour peers(nac clients)
- * address for smart mesh filtering
- * @soc_hdl: cdp soc handle
- * @vdev_id: id of virtual device object
- * @cmd: Add/Del command
- * @macaddr: nac client mac address
- *
- * Return: success/failure
- */
-static int dp_update_filter_neighbour_peers(struct cdp_soc_t *soc_hdl,
-					    uint8_t vdev_id,
-					    uint32_t cmd, uint8_t *macaddr)
-{
-	struct dp_soc *soc = (struct dp_soc *)soc_hdl;
-	struct dp_pdev *pdev;
-	struct dp_neighbour_peer *peer = NULL;
-	struct dp_vdev *vdev = dp_vdev_get_ref_by_id(soc, vdev_id,
-						     DP_MOD_ID_CDP);
-	struct dp_mon_pdev *mon_pdev;
-
-	if (!vdev || !macaddr)
-		goto fail0;
-
-	pdev = vdev->pdev;
-
-	if (!pdev)
-		goto fail0;
-
-	mon_pdev = pdev->monitor_pdev;
-
-	/* Store address of NAC (neighbour peer) which will be checked
-	 * against TA of received packets.
-	 */
-	if (cmd == DP_NAC_PARAM_ADD) {
-		peer = (struct dp_neighbour_peer *)qdf_mem_malloc(
-				sizeof(*peer));
-
-		if (!peer) {
-			dp_cdp_err("%pK: DP neighbour peer node memory allocation failed"
-				   , soc);
-			goto fail0;
-		}
-
-		qdf_mem_copy(&peer->neighbour_peers_macaddr.raw[0],
-			     macaddr, QDF_MAC_ADDR_SIZE);
-		peer->vdev = vdev;
-
-		qdf_spin_lock_bh(&mon_pdev->neighbour_peer_mutex);
-
-		/* add this neighbour peer into the list */
-		TAILQ_INSERT_TAIL(&mon_pdev->neighbour_peers_list, peer,
-				  neighbour_peer_list_elem);
-		qdf_spin_unlock_bh(&mon_pdev->neighbour_peer_mutex);
-
-		/* first neighbour */
-		if (!mon_pdev->neighbour_peers_added) {
-			QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-			mon_pdev->neighbour_peers_added = true;
-			dp_mon_filter_setup_smart_monitor(pdev);
-			status = dp_mon_filter_update(pdev);
-			if (status != QDF_STATUS_SUCCESS) {
-				dp_cdp_err("%pK: smart mon filter setup failed",
-					   soc);
-				dp_mon_filter_reset_smart_monitor(pdev);
-				mon_pdev->neighbour_peers_added = false;
-			}
-		}
-
-	} else if (cmd == DP_NAC_PARAM_DEL) {
-		qdf_spin_lock_bh(&mon_pdev->neighbour_peer_mutex);
-		TAILQ_FOREACH(peer, &mon_pdev->neighbour_peers_list,
-			      neighbour_peer_list_elem) {
-			if (!qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0],
-					 macaddr, QDF_MAC_ADDR_SIZE)) {
-				/* delete this peer from the list */
-				TAILQ_REMOVE(&mon_pdev->neighbour_peers_list,
-					     peer, neighbour_peer_list_elem);
-				qdf_mem_free(peer);
-				break;
-			}
-		}
-		/* last neighbour deleted */
-		if (TAILQ_EMPTY(&mon_pdev->neighbour_peers_list)) {
-			QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-			dp_mon_filter_reset_smart_monitor(pdev);
-			status = dp_mon_filter_update(pdev);
-			if (status != QDF_STATUS_SUCCESS) {
-				dp_cdp_err("%pK: smart mon filter clear failed",
-					   soc);
-			}
-			mon_pdev->neighbour_peers_added = false;
-		}
-		qdf_spin_unlock_bh(&mon_pdev->neighbour_peer_mutex);
-	}
-	dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
-	return 1;
-
-fail0:
-	if (vdev)
-		dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
-	return 0;
-}
-#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */
-
 /**
  * dp_update_mon_mac_filter() - Set/reset monitor mac filter
  * @soc_hdl: cdp soc handle
@@ -1716,94 +1608,6 @@ static QDF_STATUS dp_update_mon_mac_filter(struct cdp_soc_t *soc_hdl,
 	return status;
 }
 
-#ifdef ATH_SUPPORT_NAC_RSSI
-/**
- * dp_vdev_get_neighbour_rssi() - Store RSSI for configured NAC
- * @soc_hdl: DP soc handle
- * @vdev_id: id of DP vdev handle
- * @mac_addr: neighbour mac
- * @rssi: rssi value
- *
- * Return: 0 for success. nonzero for failure.
- */
-static QDF_STATUS  dp_vdev_get_neighbour_rssi(struct cdp_soc_t *soc_hdl,
-					      uint8_t vdev_id,
-					      char *mac_addr,
-					      uint8_t *rssi)
-{
-	struct dp_soc *soc = cdp_soc_t_to_dp_soc(soc_hdl);
-	struct dp_vdev *vdev = dp_vdev_get_ref_by_id(soc, vdev_id,
-						     DP_MOD_ID_CDP);
-	struct dp_pdev *pdev;
-	struct dp_neighbour_peer *peer = NULL;
-	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	struct dp_mon_pdev *mon_pdev;
-
-	if (!vdev)
-		return status;
-
-	pdev = vdev->pdev;
-	mon_pdev = pdev->monitor_pdev;
-
-	*rssi = 0;
-	qdf_spin_lock_bh(&mon_pdev->neighbour_peer_mutex);
-	TAILQ_FOREACH(peer, &mon_pdev->neighbour_peers_list,
-		      neighbour_peer_list_elem) {
-		if (qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0],
-				mac_addr, QDF_MAC_ADDR_SIZE) == 0) {
-			*rssi = peer->rssi;
-			status = QDF_STATUS_SUCCESS;
-			break;
-		}
-	}
-	qdf_spin_unlock_bh(&mon_pdev->neighbour_peer_mutex);
-	dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
-	return status;
-}
-
-static QDF_STATUS
-dp_config_for_nac_rssi(struct cdp_soc_t *cdp_soc,
-		       uint8_t vdev_id,
-		       enum cdp_nac_param_cmd cmd, char *bssid,
-		       char *client_macaddr,
-		       uint8_t chan_num)
-{
-	struct dp_soc *soc = (struct dp_soc *)cdp_soc;
-	struct dp_vdev *vdev = dp_vdev_get_ref_by_id(soc, vdev_id,
-						     DP_MOD_ID_CDP);
-	struct dp_pdev *pdev;
-	struct dp_mon_pdev *mon_pdev;
-
-	if (!vdev)
-		return QDF_STATUS_E_FAILURE;
-
-	pdev = (struct dp_pdev *)vdev->pdev;
-
-	mon_pdev = pdev->monitor_pdev;
-	mon_pdev->nac_rssi_filtering = 1;
-	/* Store address of NAC (neighbour peer) which will be checked
-	 * against TA of received packets.
-	 */
-
-	if (cmd == CDP_NAC_PARAM_ADD) {
-		dp_update_filter_neighbour_peers(cdp_soc, vdev->vdev_id,
-						 DP_NAC_PARAM_ADD,
-						 (uint8_t *)client_macaddr);
-	} else if (cmd == CDP_NAC_PARAM_DEL) {
-		dp_update_filter_neighbour_peers(cdp_soc, vdev->vdev_id,
-						 DP_NAC_PARAM_DEL,
-						 (uint8_t *)client_macaddr);
-	}
-
-	if (soc->cdp_soc.ol_ops->config_bssid_in_fw_for_nac_rssi)
-		soc->cdp_soc.ol_ops->config_bssid_in_fw_for_nac_rssi
-			(soc->ctrl_psoc, pdev->pdev_id,
-			 vdev->vdev_id, cmd, bssid, client_macaddr);
-
-	dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_CDP);
-	return QDF_STATUS_SUCCESS;
-}
-#endif
 
 bool
 dp_enable_mon_reap_timer(struct cdp_soc_t *soc_hdl,
@@ -6406,16 +6210,6 @@ 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 */
 #if defined(WLAN_CFR_ENABLE) && defined(WLAN_ENH_CFR_ENABLE)
 		dp_cfr_filter_register_1_0(ops);
 #endif
@@ -6427,16 +6221,6 @@ void dp_mon_cdp_ops_register(struct dp_soc *soc)
 	case TARGET_TYPE_QCA5332:
 #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 */
 #if defined(WLAN_CFR_ENABLE) && defined(WLAN_ENH_CFR_ENABLE)
 		dp_cfr_filter_register_2_0(ops);
 #endif
@@ -6510,13 +6294,6 @@ void dp_mon_cdp_ops_deregister(struct dp_soc *soc)
 	ops->misc_ops->pkt_log_con_service = NULL;
 	ops->misc_ops->pkt_log_exit = NULL;
 #endif
-#ifdef ATH_SUPPORT_NAC_RSSI
-	ops->ctrl_ops->txrx_vdev_config_for_nac_rssi = NULL;
-	ops->ctrl_ops->txrx_vdev_get_neighbour_rssi = NULL;
-#endif
-#if defined(ATH_SUPPORT_NAC_RSSI) || defined(ATH_SUPPORT_NAC)
-	ops->ctrl_ops->txrx_update_filter_neighbour_peers = NULL;
-#endif /* ATH_SUPPORT_NAC_RSSI || ATH_SUPPORT_NAC */
 	ops->ctrl_ops->enable_peer_based_pktlog = NULL;
 #if defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(WLAN_RX_PKT_CAPTURE_ENH)
 	ops->ctrl_ops->txrx_update_peer_pkt_capture_params = NULL;