diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index f499b1de02..55bc63355b 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -1345,7 +1345,7 @@ struct ol_if_ops {
 
 	void (*update_dp_stats)(void *soc, void *stats, uint16_t id,
 			uint8_t type);
-#ifdef FEATURE_NAC_RSSI
+#ifdef RX_PEER_INVALID_ENH
 	uint8_t (*rx_invalid_peer)(struct cdp_ctrl_objmgr_psoc *soc,
 				   uint8_t pdev_id, void *msg);
 #else
diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c
index c7036f6ed9..f5a1dacb0b 100644
--- a/dp/wifi3.0/dp_rx.c
+++ b/dp/wifi3.0/dp_rx.c
@@ -1347,7 +1347,7 @@ QDF_STATUS dp_rx_filter_mesh_packets(struct dp_vdev *vdev, qdf_nbuf_t nbuf,
 
 #endif
 
-#ifdef FEATURE_NAC_RSSI
+#ifdef RX_PEER_INVALID_ENH
 /**
  * dp_rx_process_invalid_peer(): Function to pass invalid peer list to umac
  * @soc: DP SOC handle
diff --git a/dp/wifi3.0/monitor/dp_mon.h b/dp/wifi3.0/monitor/dp_mon.h
index 0a746552a0..f6468de360 100644
--- a/dp/wifi3.0/monitor/dp_mon.h
+++ b/dp/wifi3.0/monitor/dp_mon.h
@@ -1633,6 +1633,11 @@ static inline QDF_STATUS dp_monitor_drop_inv_peer_pkts(struct dp_vdev *vdev)
 
 	return QDF_STATUS_E_FAILURE;
 }
+#else
+static inline QDF_STATUS dp_monitor_drop_inv_peer_pkts(struct dp_vdev *vdev)
+{
+	return QDF_STATUS_E_FAILURE;
+}
 #endif
 
 /*
@@ -3408,6 +3413,12 @@ static inline QDF_STATUS dp_monitor_filter_neighbour_peer(struct dp_pdev *pdev,
 
 	return monitor_ops->mon_filter_neighbour_peer(pdev, rx_pkt_hdr);
 }
+#else
+static inline QDF_STATUS dp_monitor_filter_neighbour_peer(struct dp_pdev *pdev,
+							  uint8_t *rx_pkt_hdr)
+{
+	return QDF_STATUS_E_FAILURE;
+}
 #endif
 
 static inline