diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 3ab1dbe003e6..75944d45d1b7 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -3559,14 +3559,14 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 		hddLog(LOGE, FL("attr source mac address failed"));
 		goto fail;
 	}
-	nla_memcpy(add_req->macAddress, tb[PARAM_SRC_MAC_ADDR],
+	nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR],
 			CDF_MAC_ADDR_SIZE);
 	hddLog(LOG1, "input src mac address: "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(add_req->macAddress));
+			MAC_ADDR_ARRAY(add_req->mac_address.bytes));
 
-	if (memcmp(add_req->macAddress, adapter->macAddressCurrent.bytes,
-		CDF_MAC_ADDR_SIZE)) {
-		hddLog(LOGE, FL("input src mac address and connected ap bssid are different"));
+	if (!cdf_is_macaddr_equal(&add_req->mac_address,
+				  &adapter->macAddressCurrent)) {
+		hdd_err("input src mac address and connected ap bssid are different");
 		goto fail;
 	}
 
@@ -3596,7 +3596,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 	len = 0;
 	cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, CDF_MAC_ADDR_SIZE);
 	len += CDF_MAC_ADDR_SIZE;
-	cdf_mem_copy(&add_req->ucPattern[len], add_req->macAddress,
+	cdf_mem_copy(&add_req->ucPattern[len], add_req->mac_address.bytes,
 			CDF_MAC_ADDR_SIZE);
 	len += CDF_MAC_ADDR_SIZE;
 	cdf_mem_copy(&add_req->ucPattern[len], &eth_type, 2);
diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c
index 54259162475f..7cb79d309206 100644
--- a/core/hdd/src/wlan_hdd_debugfs.c
+++ b/core/hdd/src/wlan_hdd_debugfs.c
@@ -473,8 +473,8 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	addPeriodicTxPtrnParams->ucPtrnId = pattern_idx;
 	addPeriodicTxPtrnParams->usPtrnIntervalMs = pattern_duration * 500;
 	addPeriodicTxPtrnParams->ucPtrnSize = pattern_len;
-	cdf_mem_copy(addPeriodicTxPtrnParams->macAddress,
-		     pAdapter->macAddressCurrent.bytes, 6);
+	cdf_copy_macaddr(&addPeriodicTxPtrnParams->mac_address,
+			 &pAdapter->macAddressCurrent);
 
 	/* Extract the pattern */
 	for (i = 0; i < addPeriodicTxPtrnParams->ucPtrnSize; i++) {
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 41c3de92b291..5278c2b76e40 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -3676,7 +3676,7 @@ typedef struct sSirLinkSpeedInfo {
 
 typedef struct sSirAddPeriodicTxPtrn {
 	/* MAC Address for the adapter */
-	tSirMacAddr macAddress;
+	struct cdf_mac_addr mac_address;
 	uint8_t ucPtrnId;       /* Pattern ID */
 	uint16_t ucPtrnSize;    /* Pattern size */
 	uint32_t usPtrnIntervalMs;      /* In msec */
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 74ede3e6d92d..9c8e23917232 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -5142,10 +5142,10 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle,
 		return CDF_STATUS_E_NOMEM;
 	}
 	if (!wma_find_vdev_by_addr(wma_handle,
-				   pAddPeriodicTxPtrnParams->macAddress,
+				   pAddPeriodicTxPtrnParams->mac_address.bytes,
 				   &vdev_id)) {
 		WMA_LOGE("%s: Failed to find vdev id for %pM", __func__,
-			 pAddPeriodicTxPtrnParams->macAddress);
+			 pAddPeriodicTxPtrnParams->mac_address.bytes);
 		cdf_nbuf_free(wmi_buf);
 		return CDF_STATUS_E_INVAL;
 	}