diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 5d280162b06b..3eeffea51bbe 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1127,7 +1127,7 @@ typedef enum eSirSmeStatusChangeCode {
 } tSirSmeStatusChangeCode;
 
 typedef struct sSirSmeNewBssInfo {
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssId;
 	uint8_t channelNumber;
 	uint8_t reserved;
 	tSirMacSSid ssId;
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 4cdacb9aeb12..b2c974cad41a 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1179,7 +1179,7 @@ void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg,
 		  sizeof(uint8_t) + pBeacon->ssId.length + 1;
 
 	cdf_mem_set((void *)&newBssInfo, sizeof(newBssInfo), 0);
-	cdf_mem_copy(newBssInfo.bssId, pHdr->bssId, sizeof(tSirMacAddr));
+	cdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, CDF_MAC_ADDR_SIZE);
 	newBssInfo.channelNumber = (tSirMacChanNum) pAddBss->currentOperChannel;
 	cdf_mem_copy((uint8_t *) &newBssInfo.ssId,
 		     (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1);
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index f9d06bd146d9..7789573af980 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -10460,7 +10460,8 @@ csr_roam_diag_joined_new_bss(tpAniSirGlobal mac_ctx,
 		return;
 	pIbssLog->eventId = WLAN_IBSS_EVENT_COALESCING;
 	if (pNewBss) {
-		cdf_mem_copy(pIbssLog->bssid, pNewBss->bssId, 6);
+		cdf_mem_copy(pIbssLog->bssid, pNewBss->bssId.bytes,
+				CDF_MAC_ADDR_SIZE);
 		if (pNewBss->ssId.length)
 			cdf_mem_copy(pIbssLog->ssid, pNewBss->ssId.ssId,
 				     pNewBss->ssId.length);