diff --git a/hal/wifi3.0/qca6490/hal_6490.c b/hal/wifi3.0/qca6490/hal_6490.c
index 7f66858b8c..08523c94ec 100644
--- a/hal/wifi3.0/qca6490/hal_6490.c
+++ b/hal/wifi3.0/qca6490/hal_6490.c
@@ -461,12 +461,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_6490(uint8_t *buf)
 	return reception_type;
 }
 
-#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end)	\
-	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
-		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)),	\
-		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK,	\
-		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
-
 /**
  * hal_rx_msdu_end_da_idx_get_6490: API to get da_idx
  * from rx_msdu_end TLV
@@ -1291,30 +1285,6 @@ uint16_t hal_rx_get_rx_sequence_6490(uint8_t *buf)
 	return HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info);
 }
 
-/**
- * hal_rx_msdu_packet_metadata_get_6490(): API to get the
- * msdu information from rx_msdu_end TLV
- *
- * @ buf: pointer to the start of RX PKT TLV headers
- * @ hal_rx_msdu_metadata: pointer to the msdu info structure
- */
-static void
-hal_rx_msdu_packet_metadata_get_6490(uint8_t *buf,
-				     void *msdu_pkt_metadata)
-{
-	struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
-	struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
-	struct hal_rx_msdu_metadata *msdu_metadata =
-		(struct hal_rx_msdu_metadata *)msdu_pkt_metadata;
-
-	msdu_metadata->l3_hdr_pad =
-		HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(msdu_end);
-	msdu_metadata->sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
-	msdu_metadata->da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
-	msdu_metadata->sa_sw_peer_id =
-		HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end);
-}
-
 /**
  * hal_get_window_address_6490(): Function to get hp/tp address
  * @hal_soc: Pointer to hal_soc
@@ -1419,7 +1389,7 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	NULL,
 	NULL,
 	/* rx - msdu end fast path info fields */
-	hal_rx_msdu_packet_metadata_get_6490,
+	hal_rx_msdu_packet_metadata_get_generic,
 };
 
 struct hal_hw_srng_config hw_srng_table_6490[] = {
diff --git a/hal/wifi3.0/qca6490/hal_6490_rx.h b/hal/wifi3.0/qca6490/hal_6490_rx.h
index e7ae7e78f7..d1f31b6c63 100644
--- a/hal/wifi3.0/qca6490/hal_6490_rx.h
+++ b/hal/wifi3.0/qca6490/hal_6490_rx.h
@@ -356,4 +356,11 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
 			 RX_MSDU_END_10_TCP_UDP_CHKSUM_OFFSET)), \
 		RX_MSDU_END_10_TCP_UDP_CHKSUM_MASK, \
 		RX_MSDU_END_10_TCP_UDP_CHKSUM_LSB))
+
+#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)),	\
+		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK,	\
+		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
+
 #endif
diff --git a/hal/wifi3.0/qca6750/hal_6750.c b/hal/wifi3.0/qca6750/hal_6750.c
index f943cedd8d..6132b174bb 100644
--- a/hal/wifi3.0/qca6750/hal_6750.c
+++ b/hal/wifi3.0/qca6750/hal_6750.c
@@ -453,12 +453,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_6750(uint8_t *buf)
 	return reception_type;
 }
 
-#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end)	\
-	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
-		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)),	\
-		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK,	\
-		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
-
 /**
  * hal_rx_msdu_end_da_idx_get_6750: API to get da_idx
  * from rx_msdu_end TLV
@@ -1284,30 +1278,6 @@ uint16_t hal_rx_get_rx_sequence_6750(uint8_t *buf)
 	return HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info);
 }
 
-/**
- * hal_rx_msdu_packet_metadata_get_6750(): API to get the
- * msdu information from rx_msdu_end TLV
- *
- * @ buf: pointer to the start of RX PKT TLV headers
- * @ hal_rx_msdu_metadata: pointer to the msdu info structure
- */
-static void
-hal_rx_msdu_packet_metadata_get_6750(uint8_t *buf,
-				     void *msdu_pkt_metadata)
-{
-	struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
-	struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
-	struct hal_rx_msdu_metadata *msdu_metadata =
-		(struct hal_rx_msdu_metadata *)msdu_pkt_metadata;
-
-	msdu_metadata->l3_hdr_pad =
-		HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(msdu_end);
-	msdu_metadata->sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
-	msdu_metadata->da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
-	msdu_metadata->sa_sw_peer_id =
-		HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end);
-}
-
 /**
  * hal_get_window_address_6750(): Function to get hp/tp address
  * @hal_soc: Pointer to hal_soc
@@ -1412,7 +1382,7 @@ struct hal_hw_txrx_ops qca6750_hal_hw_txrx_ops = {
 	NULL,
 	NULL,
 	/* rx - msdu end fast path info fields */
-	hal_rx_msdu_packet_metadata_get_6750,
+	hal_rx_msdu_packet_metadata_get_generic,
 };
 
 struct hal_hw_srng_config hw_srng_table_6750[] = {
diff --git a/hal/wifi3.0/qca6750/hal_6750_rx.h b/hal/wifi3.0/qca6750/hal_6750_rx.h
index cad936681f..10f70c5e0c 100644
--- a/hal/wifi3.0/qca6750/hal_6750_rx.h
+++ b/hal/wifi3.0/qca6750/hal_6750_rx.h
@@ -356,4 +356,10 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
 			 RX_MSDU_END_10_TCP_UDP_CHKSUM_OFFSET)), \
 		RX_MSDU_END_10_TCP_UDP_CHKSUM_MASK, \
 		RX_MSDU_END_10_TCP_UDP_CHKSUM_LSB))
+
+#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)),	\
+		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK,	\
+		RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
 #endif
diff --git a/hal/wifi3.0/qcn9000/hal_9000.c b/hal/wifi3.0/qcn9000/hal_9000.c
index 300468bf61..ee16b96c60 100644
--- a/hal/wifi3.0/qcn9000/hal_9000.c
+++ b/hal/wifi3.0/qcn9000/hal_9000.c
@@ -1343,30 +1343,6 @@ static inline void hal_write_window_register(struct hal_soc *hal_soc)
 		      WINDOW_CONFIGURATION_VALUE_9000);
 }
 
-/**
- * hal_rx_msdu_packet_metadata_get_9000(): API to get the
- * msdu information from rx_msdu_end TLV
- *
- * @ buf: pointer to the start of RX PKT TLV headers
- * @ hal_rx_msdu_metadata: pointer to the msdu info structure
- */
-static void
-hal_rx_msdu_packet_metadata_get_9000(uint8_t *buf,
-				     void *msdu_pkt_metadata)
-{
-	struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
-	struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
-	struct hal_rx_msdu_metadata *msdu_metadata =
-		(struct hal_rx_msdu_metadata *)msdu_pkt_metadata;
-
-	msdu_metadata->l3_hdr_pad =
-		HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(msdu_end);
-	msdu_metadata->sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
-	msdu_metadata->da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
-	msdu_metadata->sa_sw_peer_id =
-		HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end);
-}
-
 struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -1459,7 +1435,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 	NULL,
 	NULL,
 	/* rx - msdu fast path info fields */
-	hal_rx_msdu_packet_metadata_get_9000,
+	hal_rx_msdu_packet_metadata_get_generic,
 };
 
 struct hal_hw_srng_config hw_srng_table_9000[] = {