diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 3b50abf90b2f..42b9950331cc 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -8585,10 +8585,8 @@ static int __iw_set_keepalive_params(struct net_device *dev,
 		       request->destIpv4Addr[0], request->destIpv4Addr[1],
 		       request->destIpv4Addr[2], request->destIpv4Addr[3]);
 
-		hdd_info("Dest MAC address: %d:%d:%d:%d:%d:%d",
-		       request->destMacAddr[0], request->destMacAddr[1],
-		       request->destMacAddr[2], request->destMacAddr[3],
-		       request->destMacAddr[4], request->destMacAddr[5]);
+		hdd_info("Dest MAC address: "MAC_ADDRESS_STR,
+		       MAC_ADDR_ARRAY(request->dest_macaddr.bytes));
 		break;
 	}
 
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index a710e37a462a..e873d6de9e92 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2582,8 +2582,8 @@ typedef struct sSirKeepAliveReq {
 	uint32_t timePeriod;
 	tSirIpv4Addr hostIpv4Addr;
 	tSirIpv4Addr destIpv4Addr;
-	tSirMacAddr destMacAddr;
-	tSirMacAddr bssId;
+	struct cdf_mac_addr dest_macaddr;
+	struct cdf_mac_addr bssid;
 	uint8_t sessionId;
 } tSirKeepAliveReq, *tpSirKeepAliveReq;
 
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 382f93decaa8..5618a8fdd746 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -6013,8 +6013,7 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id,
 		return CDF_STATUS_E_NOMEM;
 	}
 
-	cdf_mem_copy(request->bssId, pSession->connectedProfile.bssid.bytes,
-		     sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid);
 	cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq));
 
 	CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW,
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 2287edb20722..1171b7ad2dd3 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -2622,7 +2622,8 @@ void wma_set_keepalive_req(tp_wma_handle wma,
 			       keepalive->packetType,
 			       keepalive->timePeriod,
 			       keepalive->hostIpv4Addr,
-			       keepalive->destIpv4Addr, keepalive->destMacAddr);
+			       keepalive->destIpv4Addr,
+			       keepalive->dest_macaddr.bytes);
 
 	cdf_mem_free(keepalive);
 }