diff --git a/core/mac/src/pe/include/lim_ft_defs.h b/core/mac/src/pe/include/lim_ft_defs.h
index da4f11f7a27c..34c0ba68570f 100644
--- a/core/mac/src/pe/include/lim_ft_defs.h
+++ b/core/mac/src/pe/include/lim_ft_defs.h
@@ -89,7 +89,7 @@ typedef struct sSirFTUpdateKeyInfo {
 	uint16_t messageType;
 	uint16_t length;
 	uint32_t smeSessionId;
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssid;
 	tSirKeyMaterial keyMaterial;
 } tSirFTUpdateKeyInfo, *tpSirFTUpdateKeyInfo;
 
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 09575f762364..ffab46808c22 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -1608,13 +1608,14 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 
 	pKeyInfo = (tSirFTUpdateKeyInfo *) pMsgBuf;
 
-	psessionEntry = pe_find_session_by_bssid(pMac, pKeyInfo->bssId, &sessionId);
+	psessionEntry = pe_find_session_by_bssid(pMac, pKeyInfo->bssid.bytes,
+						 &sessionId);
 	if (NULL == psessionEntry) {
 		PELOGE(lim_log(pMac, LOGE,
 			       "%s: Unable to find session for the following bssid",
 			       __func__);
 		       )
-		lim_print_mac_addr(pMac, pKeyInfo->bssId, LOGE);
+		lim_print_mac_addr(pMac, pKeyInfo->bssid.bytes, LOGE);
 		return false;
 	}
 
@@ -1635,8 +1636,8 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 			extSetStaKeyParam;
 
 		cdf_mem_zero(pMlmSetKeysReq, sizeof(tLimMlmSetKeysReq));
-		cdf_mem_copy(pMlmSetKeysReq->peer_macaddr.bytes,
-				pKeyInfo->bssId, CDF_MAC_ADDR_SIZE);
+		cdf_copy_macaddr(&pMlmSetKeysReq->peer_macaddr,
+				 &pKeyInfo->bssid);
 		pMlmSetKeysReq->sessionId = psessionEntry->peSessionId;
 		pMlmSetKeysReq->smesessionId = psessionEntry->smeSessionId;
 		pMlmSetKeysReq->edType = pKeyInfo->keyMaterial.edType;
@@ -1684,11 +1685,10 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 
 		PELOG1(lim_log(pMac, LOG1,
 			       FL("BSSID = " MAC_ADDRESS_STR),
-			       MAC_ADDR_ARRAY(pKeyInfo->bssId));
-		       )
+			       MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));)
 
-		sir_copy_mac_addr(pAddBssParams->extSetStaKeyParam.peer_macaddr.bytes,
-				  pKeyInfo->bssId);
+		cdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr,
+				 &pKeyInfo->bssid);
 
 		pAddBssParams->extSetStaKeyParam.sendRsp = false;
 
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index 8f141861a33c..ee6e374c4dd7 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -351,11 +351,10 @@ CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id,
 		}
 	}
 
-	cdf_mem_copy(&msg->bssId[0],
-			&ftkey_info->peerMac.bytes[0], CDF_MAC_ADDR_SIZE);
+	cdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac);
 	msg->smeSessionId = session_id;
 	sms_log(mac_ctx, LOG1, "BSSID = " MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(msg->bssId));
+		MAC_ADDR_ARRAY(msg->bssid.bytes));
 	status = cds_send_mb_message_to_mac(msg);
 
 	return status;