diff --git a/dp/wifi3.0/dp_rx_mon_feature.c b/dp/wifi3.0/dp_rx_mon_feature.c
index b8a096048d..ca93d59482 100644
--- a/dp/wifi3.0/dp_rx_mon_feature.c
+++ b/dp/wifi3.0/dp_rx_mon_feature.c
@@ -392,7 +392,7 @@ dp_rx_enh_capture_is_peer_enabled(struct dp_soc *soc,
 		ast_entry = soc->ast_table[ast_index];
 		if (ast_entry) {
 			peer = ast_entry->peer;
-			if (peer && (peer->peer_ids[0] != HTT_INVALID_PEER))
+			if (peer && (peer->peer_id != HTT_INVALID_PEER))
 				return peer->rx_cap_enabled;
 		}
 	}
diff --git a/dp/wifi3.0/dp_tx_capture.c b/dp/wifi3.0/dp_tx_capture.c
index 55537a1a73..a8792932f9 100644
--- a/dp/wifi3.0/dp_tx_capture.c
+++ b/dp/wifi3.0/dp_tx_capture.c
@@ -165,7 +165,7 @@ void dp_tx_capture_print_stats(struct dp_peer *peer)
 
 	stats = &peer->tx_capture.stats;
 	DP_PRINT_STATS(" peer_id[%d] MSDU[S:%u E:%u D:%u F:%u DP:%u X:%u] MPDU[T:%u S:%u R:%u A:%u C:%u ST:%u]",
-			peer->peer_ids[0],
+			peer->peer_id,
 			stats->msdu[PEER_MSDU_SUCC],
 			stats->msdu[PEER_MSDU_ENQ],
 			stats->msdu[PEER_MSDU_DEQ],
@@ -322,7 +322,7 @@ void dp_print_tid_qlen_per_peer(void *pdev_hdl, uint8_t consolidated)
 				if (!msdu_len && !ppdu_len && !tasklet_msdu_len)
 					continue;
 				DP_PRINT_STATS(" peer_id[%d] tid[%d] msdu_comp_q[%d] defer_msdu_q[%d] pending_ppdu_q[%d]",
-					       peer->peer_ids[0], tid,
+					       peer->peer_id, tid,
 					       tasklet_msdu_len,
 					       msdu_len, ppdu_len);
 			}
@@ -2975,7 +2975,7 @@ dp_tx_mon_proc_xretries(struct dp_pdev *pdev, struct dp_peer *peer,
 			qdf_nbuf_data(ppdu_nbuf);
 
 		usr_idx = dp_tx_find_usr_idx_from_peer_id(ppdu_desc,
-							  peer->peer_ids[0]);
+							  peer->peer_id);
 
 		user = &ppdu_desc->user[usr_idx];
 
@@ -5228,11 +5228,11 @@ QDF_STATUS dp_send_cts_frame_to_stack(struct dp_soc *soc,
 	}
 
 	peer = ast_entry->peer;
-	if (!peer || peer->peer_ids[0] == HTT_INVALID_PEER) {
+	if (!peer || peer->peer_id == HTT_INVALID_PEER) {
 		qdf_spin_unlock_bh(&soc->ast_lock);
 		return QDF_STATUS_E_FAILURE;
 	}
-	peer_id = peer->peer_ids[0];
+	peer_id = peer->peer_id;
 	qdf_spin_unlock_bh(&soc->ast_lock);
 
 	peer = dp_peer_find_by_id(soc, peer_id);
@@ -5367,11 +5367,11 @@ void dp_send_usr_ack_frm_to_stack(struct dp_soc *soc,
 	}
 
 	peer = ast_entry->peer;
-	if (!peer || peer->peer_ids[0] == HTT_INVALID_PEER) {
+	if (!peer || peer->peer_id == HTT_INVALID_PEER) {
 		qdf_spin_unlock_bh(&soc->ast_lock);
 		return;
 	}
-	peer_id = peer->peer_ids[0];
+	peer_id = peer->peer_id;
 	qdf_spin_unlock_bh(&soc->ast_lock);
 
 	peer = dp_peer_find_by_id(soc, peer_id);
@@ -5635,11 +5635,11 @@ QDF_STATUS dp_send_noack_frame_to_stack(struct dp_soc *soc,
 	}
 
 	peer = ast_entry->peer;
-	if (!peer || peer->peer_ids[0] == HTT_INVALID_PEER) {
+	if (!peer || peer->peer_id == HTT_INVALID_PEER) {
 		qdf_spin_unlock_bh(&soc->ast_lock);
 		return QDF_STATUS_E_FAILURE;
 	}
-	peer_id = peer->peer_ids[0];
+	peer_id = peer->peer_id;
 	qdf_spin_unlock_bh(&soc->ast_lock);
 
 	peer = dp_peer_find_by_id(soc, peer_id);
@@ -5767,7 +5767,7 @@ void dp_peer_tx_capture_filter_check(struct dp_pdev *pdev,
 	if (!peer)
 		return;
 
-	if (dp_peer_tx_cap_search(pdev, peer->peer_ids[0],
+	if (dp_peer_tx_cap_search(pdev, peer->peer_id,
 				  peer->mac_addr.raw)) {
 		peer->tx_cap_enabled = 1;
 	}
diff --git a/dp/wifi3.0/dp_txrx_wds.c b/dp/wifi3.0/dp_txrx_wds.c
index 4c7c82e47a..cb16420a30 100644
--- a/dp/wifi3.0/dp_txrx_wds.c
+++ b/dp/wifi3.0/dp_txrx_wds.c
@@ -958,7 +958,7 @@ void dp_peer_ast_index_flow_queue_map_create(void *soc_hdl,
 
 	if (soc->cdp_soc.ol_ops->peer_ast_flowid_map) {
 		soc->cdp_soc.ol_ops->peer_ast_flowid_map(
-				soc->ctrl_psoc, peer->peer_ids[0],
+				soc->ctrl_psoc, peer->peer_id,
 				peer->vdev->vdev_id, peer_mac_addr);
 	}
 
diff --git a/dp/wifi3.0/dp_txrx_wds.h b/dp/wifi3.0/dp_txrx_wds.h
index 6df07b0c98..8aa0207341 100644
--- a/dp/wifi3.0/dp_txrx_wds.h
+++ b/dp/wifi3.0/dp_txrx_wds.h
@@ -213,7 +213,7 @@ dp_rx_wds_add_or_update_ast(struct dp_soc *soc, struct dp_peer *ta_peer,
 	if (ast->is_mapped && (ast->ast_idx == sa_idx))
 		ast->is_active = TRUE;
 
-	if (sa_sw_peer_id != ta_peer->peer_ids[0]) {
+	if (sa_sw_peer_id != ta_peer->peer_id) {
 		sa_peer = ast->peer;
 
 		if ((ast->type != CDP_TXRX_AST_TYPE_STATIC) &&