diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index d41818245bca..e284ecefec2a 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2473,7 +2473,7 @@ typedef struct sSirSetHT2040Mode {
 	uint16_t length;
 	uint8_t cbMode;
 	bool obssEnabled;
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssid;
 	uint8_t sessionId;      /* Session ID */
 } tSirSetHT2040Mode, *tpSirSetHT2040Mode;
 #endif
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 70ceb3dfba6b..98da86c48ea7 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
@@ -4341,12 +4341,12 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
 	pSetHT2040Mode = (tpSirSetHT2040Mode) pMsgBuf;
 
 	psessionEntry = pe_find_session_by_bssid(pMac,
-				pSetHT2040Mode->bssId,
+				pSetHT2040Mode->bssid.bytes,
 				&sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOG1,
 			FL("Session does not exist for given BSSID "));
-		lim_print_mac_addr(pMac, pSetHT2040Mode->bssId, LOG1);
+		lim_print_mac_addr(pMac, pSetHT2040Mode->bssid.bytes, LOG1);
 		return;
 	}
 
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 0c96ec5aeef4..afdd9c4e8857 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -14206,12 +14206,10 @@ CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId,
 		pMsg->messageType = eWNI_SME_SET_HT_2040_MODE;
 		pMsg->length = len;
 
-		/* bssId */
-		cdf_mem_copy((tSirMacAddr *) pMsg->bssId,
-			     &pSession->selfMacAddr, sizeof(tSirMacAddr));
+		cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
 		sms_log(pMac, LOG1,
 			FL("CSR Attempting to set HT20/40 mode for Bssid= "
-			   MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMsg->bssId));
+			   MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMsg->bssid.bytes));
 		pMsg->sessionId = sessionId;
 		sms_log(pMac, LOG1, FL("  session %d HT20/40 mode %d"),
 			sessionId, cbMode);