diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 5c3b659ab8a9..fcb331a9c22b 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -2367,11 +2367,11 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 				hddLog(LOGE, FL("attr mac address failed"));
 				goto fail;
 			}
-			nla_memcpy(roam_params.bssid_favored[i],
+			nla_memcpy(roam_params.bssid_favored[i].bytes,
 				tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_BSSID],
-				sizeof(tSirMacAddr));
-			hddLog(CDF_TRACE_LEVEL_DEBUG, MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(roam_params.bssid_favored[i]));
+				CDF_MAC_ADDR_SIZE);
+			hdd_debug(MAC_ADDRESS_STR,
+			    MAC_ADDR_ARRAY(roam_params.bssid_favored[i].bytes));
 			/* Parse and fetch preference factor*/
 			if (!tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_RSSI_MODIFIER]) {
 				hddLog(LOGE, FL("BSSID Preference score failed"));
@@ -2412,12 +2412,12 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 				hddLog(LOGE, FL("attr blacklist addr failed"));
 				goto fail;
 			}
-			nla_memcpy(roam_params.bssid_avoid_list[i],
+			nla_memcpy(roam_params.bssid_avoid_list[i].bytes,
 				tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_BSSID],
-				sizeof(tSirMacAddr));
-			hddLog(CDF_TRACE_LEVEL_DEBUG, MAC_ADDRESS_STR,
+				CDF_MAC_ADDR_SIZE);
+			hdd_debug(MAC_ADDRESS_STR,
 				MAC_ADDR_ARRAY(
-				roam_params.bssid_avoid_list[i]));
+				roam_params.bssid_avoid_list[i].bytes));
 			i++;
 		}
 		sme_update_roam_params(pHddCtx->hHal, session_id,
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 7861f194066e..c96ca50d252e 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2880,8 +2880,8 @@ struct roam_ext_params {
 	uint8_t num_ssid_allowed_list;
 	uint8_t num_bssid_favored;
 	tSirMacSSid ssid_allowed_list[MAX_SSID_ALLOWED_LIST];
-	tSirMacAddr bssid_avoid_list[MAX_BSSID_AVOID_LIST];
-	tSirMacAddr bssid_favored[MAX_BSSID_FAVORED];
+	struct cdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST];
+	struct cdf_mac_addr bssid_favored[MAX_BSSID_FAVORED];
 	uint8_t bssid_favored_factor[MAX_BSSID_FAVORED];
 	int raise_rssi_thresh_5g;
 	int drop_rssi_thresh_5g;
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index d53f36ab5a4f..382f93decaa8 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -1509,13 +1509,12 @@ CDF_STATUS sme_update_roam_params(tHalHandle hal,
 		break;
 	case REASON_ROAM_SET_BLACKLIST_BSSID:
 		cdf_mem_set(&roam_params_dst->bssid_avoid_list, 0,
-			sizeof(tSirMacAddr) * MAX_BSSID_AVOID_LIST);
+			CDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST);
 		roam_params_dst->num_bssid_avoid_list =
 			roam_params_src.num_bssid_avoid_list;
 		for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
-			cdf_mem_copy(&roam_params_dst->bssid_avoid_list[i],
-				&roam_params_src.bssid_avoid_list[i],
-				sizeof(tSirMacAddr));
+			cdf_copy_macaddr(&roam_params_dst->bssid_avoid_list[i],
+					&roam_params_src.bssid_avoid_list[i]);
 		}
 		break;
 	case REASON_ROAM_GOOD_RSSI_CHANGED:
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 252ba49fcd59..72d99e285b6e 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -17035,7 +17035,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
 			"Blacklist Bssid: ("MAC_ADDRESS_STR")",
-			MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i]));
+			MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].bytes));
 	}
 	for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) {
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
@@ -17046,7 +17046,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	for (i = 0; i < roam_params_dst->num_bssid_favored; i++) {
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
 			"Preferred Bssid: ("MAC_ADDRESS_STR") score: %d",
-			MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i]),
+			MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes),
 			roam_params_dst->bssid_favored_factor[i]);
 	}