diff --git a/dp/wifi3.0/dp_txrx_wds.h b/dp/wifi3.0/dp_txrx_wds.h
index e974627ade..5e2ad2d1f2 100644
--- a/dp/wifi3.0/dp_txrx_wds.h
+++ b/dp/wifi3.0/dp_txrx_wds.h
@@ -286,11 +286,10 @@ static inline void
 dp_rx_wds_srcport_learn(struct dp_soc *soc,
 			uint8_t *rx_tlv_hdr,
 			struct dp_peer *ta_peer,
-			qdf_nbuf_t nbuf)
+			qdf_nbuf_t nbuf,
+			struct hal_rx_msdu_metadata msdu_end_info)
 {
-	uint16_t sa_sw_peer_id = hal_rx_msdu_end_sa_sw_peer_id_get(soc->hal_soc, rx_tlv_hdr);
-	uint8_t sa_is_valid = hal_rx_msdu_end_sa_is_valid_get(soc->hal_soc, rx_tlv_hdr);
-	uint16_t sa_idx;
+	uint8_t sa_is_valid = qdf_nbuf_is_sa_valid(nbuf);
 	uint8_t is_chfrag_start = 0;
 	uint8_t is_ad4_valid = 0;
 
@@ -305,11 +304,9 @@ dp_rx_wds_srcport_learn(struct dp_soc *soc,
 	/*
 	 * Get the AST entry from HW SA index and mark it as active
 	 */
-	sa_idx = hal_rx_msdu_end_sa_idx_get(soc->hal_soc, rx_tlv_hdr);
-
 	dp_rx_wds_add_or_update_ast(soc, ta_peer, nbuf, is_ad4_valid,
 				    sa_is_valid, is_chfrag_start,
-				    sa_idx, sa_sw_peer_id);
+				    msdu_end_info.sa_idx, msdu_end_info.sa_sw_peer_id);
 }
 
 /*