diff --git a/dp/inc/cdp_txrx_cmn.h b/dp/inc/cdp_txrx_cmn.h
index cb9ed8ca2d..a447d9021d 100644
--- a/dp/inc/cdp_txrx_cmn.h
+++ b/dp/inc/cdp_txrx_cmn.h
@@ -130,6 +130,14 @@ enum verbose_debug_module {
 		(_peer_info)->peer_type = (_peer_type);			\
 	} while (0); })
 
+#ifdef WLAN_FEATURE_11BE_MLO
+#define CDP_RX_ML_PEER_VALID_MASK  (0x00002000)
+#define CDP_RX_ML_PEER_VALID_SHIFT (13)
+#define CDP_RX_GET_ML_PEER_VALID(skb) \
+	((QDF_NBUF_CB_RX_PEER_ID(skb) & \
+	  CDP_RX_ML_PEER_VALID_MASK) >> CDP_RX_ML_PEER_VALID_SHIFT)
+#endif
+
 /**
  * enum vdev_host_stats_id -
  * host stats update from CDP have to set one of the following stats ID
diff --git a/dp/wifi3.0/be/dp_be_rx.c b/dp/wifi3.0/be/dp_be_rx.c
index 8dc055fcd5..9aefdac28b 100644
--- a/dp/wifi3.0/be/dp_be_rx.c
+++ b/dp/wifi3.0/be/dp_be_rx.c
@@ -1239,7 +1239,7 @@ bool dp_rx_mlo_igmp_handler(struct dp_soc *soc,
 	/* Set the ml peer valid bit in skb peer metadata, so that osif
 	 * can deliver the SA mangled IGMP packet to mld netdev.
 	 */
-	QDF_NBUF_CB_RX_SET_ML_PEER_VALID(nbuf);
+	QDF_NBUF_CB_RX_PEER_ID(nbuf) |= CDP_RX_ML_PEER_VALID_MASK;
 	/* Deliver the original IGMP with dummy src on the mld netdev */
 send_pkt:
 	dp_rx_deliver_to_stack(be_vdev->vdev.pdev->soc,
diff --git a/qdf/linux/src/i_qdf_nbuf_w.h b/qdf/linux/src/i_qdf_nbuf_w.h
index 3d30dc85e6..fef4c6d978 100644
--- a/qdf/linux/src/i_qdf_nbuf_w.h
+++ b/qdf/linux/src/i_qdf_nbuf_w.h
@@ -430,18 +430,6 @@ QDF_COMPILE_TIME_ASSERT(qdf_nbuf_cb_size,
 	(((struct qdf_nbuf_cb *) \
 	  ((skb)->cb))->u.rx.hw_info.desc_tlv_members.peer_id)
 
-#define QDF_NBUF_CB_RX_ML_PEER_VALID_MASK  (0x00002000)
-#define QDF_NBUF_CB_RX_ML_PEER_VALID_SHIFT (13)
-
-#define QDF_NBUF_CB_RX_GET_ML_PEER_VALID(skb) \
-	((QDF_NBUF_CB_RX_PEER_ID(skb) & \
-		QDF_NBUF_CB_RX_ML_PEER_VALID_MASK) >> \
-			QDF_NBUF_CB_RX_ML_PEER_VALID_SHIFT)
-
-#define QDF_NBUF_CB_RX_SET_ML_PEER_VALID(skb) \
-	(QDF_NBUF_CB_RX_PEER_ID(nbuf) |= \
-		QDF_NBUF_CB_RX_ML_PEER_VALID_MASK)
-
 #define QDF_NBUF_CB_RX_VDEV_ID(skb) \
 	(((struct qdf_nbuf_cb *) \
 	  ((skb)->cb))->u.rx.hw_info.desc_tlv_members.vdev_id)