diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index a429a168d8d1..5d280162b06b 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -871,7 +871,7 @@ typedef struct sSirSmeScanChanReq {
 typedef struct sSirOemDataReq {
 	uint16_t messageType;   /* eWNI_SME_OEM_DATA_REQ */
 	uint16_t messageLen;
-	tSirMacAddr selfMacAddr;
+	struct cdf_mac_addr selfMacAddr;
 	uint8_t oemDataReq[OEM_DATA_REQ_SIZE];
 } tSirOemDataReq, *tpSirOemDataReq;
 
diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h
index 5ddb01c6320c..c40bb1cef5dd 100644
--- a/core/mac/src/pe/include/lim_global.h
+++ b/core/mac/src/pe/include/lim_global.h
@@ -306,7 +306,7 @@ struct tLimScanResultNode {
 
 /* OEM Data related structure definitions */
 typedef struct sLimMlmOemDataReq {
-	tSirMacAddr selfMacAddr;
+	struct cdf_mac_addr selfMacAddr;
 	uint8_t oemDataReq[OEM_DATA_REQ_SIZE];
 } tLimMlmOemDataReq, *tpLimMlmOemDataReq;
 
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 73f4bf0294ea..455e1031df9f 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -386,9 +386,8 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx)
 	cdf_mem_set((uint8_t *) (start_oem_data_req), reqlen, 0);
 
 	/* Now copy over the information to the OEM DATA REQ to HAL */
-	cdf_mem_copy(start_oem_data_req->selfMacAddr,
-		     mac_ctx->lim.gpLimMlmOemDataReq->selfMacAddr,
-		     sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&start_oem_data_req->selfMacAddr,
+			 &mac_ctx->lim.gpLimMlmOemDataReq->selfMacAddr);
 
 	cdf_mem_copy(start_oem_data_req->oemDataReq,
 		     mac_ctx->lim.gpLimMlmOemDataReq->oemDataReq,
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 88d18497ea58..764432accafc 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -1503,8 +1503,8 @@ static void __lim_process_sme_oem_data_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
 	/* Initialize this buffer */
 	cdf_mem_set(pMlmOemDataReq, (sizeof(tLimMlmOemDataReq)), 0);
 
-	cdf_mem_copy(pMlmOemDataReq->selfMacAddr, pOemDataReq->selfMacAddr,
-		     sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&pMlmOemDataReq->selfMacAddr,
+			 &pOemDataReq->selfMacAddr);
 	cdf_mem_copy(pMlmOemDataReq->oemDataReq, pOemDataReq->oemDataReq,
 		     OEM_DATA_REQ_SIZE);
 
diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c
index aeb0a0db450b..385b77d4bc32 100644
--- a/core/sme/src/oem_data/oem_data_api.c
+++ b/core/sme/src/oem_data/oem_data_api.c
@@ -38,6 +38,7 @@
 #include "cds_mq.h"
 #include "sme_inside.h"
 #include "sms_debug.h"
+#include "cdf_util.h"
 
 #include "csr_support.h"
 
@@ -222,8 +223,7 @@ CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac,
 	cdf_mem_set(pMsg, msgLen, 0);
 	pMsg->messageType = eWNI_SME_OEM_DATA_REQ;
 	pMsg->messageLen = msgLen;
-	cdf_mem_copy(pMsg->selfMacAddr, pSession->selfMacAddr.bytes,
-		     sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr);
 	cdf_mem_copy(pMsg->oemDataReq, pOemDataReq->oemDataReq,
 		     OEM_DATA_REQ_SIZE);
 	sms_log(pMac, LOGW, "OEM_DATA: sending message to pe%s", __func__);
diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h
index b7ee6974e49c..6ab2a52cb66b 100644
--- a/core/wma/inc/wma_if.h
+++ b/core/wma/inc/wma_if.h
@@ -674,7 +674,7 @@ typedef struct {
  * @oemDataReq: OEM Data request
  */
 typedef struct {
-	tSirMacAddr selfMacAddr;
+	struct cdf_mac_addr selfMacAddr;
 	CDF_STATUS status;
 	uint8_t oemDataReq[OEM_DATA_REQ_SIZE];
 } tStartOemDataReq, *tpStartOemDataReq;