diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 057101cd6246..64c743764904 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -246,7 +246,6 @@ enum hdd_driver_flags {
 /* Maximum time(ms) to wait for external acs response */
 #define WLAN_VENDOR_ACS_WAIT_TIME 1000
 
-#define MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
 /** Mac Address string **/
 #define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_ADDRESS_STR_LEN 18  /* Including null terminator */
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 87cd20843af3..409fd1466987 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -1374,8 +1374,8 @@ static void hdd_send_association_event(struct net_device *dev,
 
 		hdd_info("wlan: " MAC_ADDRESS_STR " connected to "
 			MAC_ADDRESS_STR "\n",
-			MAC_ADDR_ARRAY(adapter->mac_addr.bytes),
-			MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
+			QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes),
+			QDF_MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
 		hdd_send_update_beacon_ies_event(adapter, roam_info);
 
 		/*
@@ -1455,7 +1455,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssid.bytes,
 				ETH_ALEN);
 		hdd_debug("wlan: new IBSS peer connection to BSSID " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes));
+			QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes));
 	} else {                /* Not Associated */
 		hdd_debug("wlan: disconnected");
 		memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
@@ -2467,7 +2467,7 @@ static uint8_t hdd_get_ibss_peer_sta_id(struct hdd_station_ctx *hddstactx,
 		if (status != QDF_STATUS_SUCCESS) {
 			hdd_err("Unable to find station ID for "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(roaminfo->peerMac.bytes));
+				QDF_MAC_ADDR_ARRAY(roaminfo->peerMac.bytes));
 		}
 	}
 
@@ -2657,7 +2657,7 @@ hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter,
 	 */
 	hdd_debug("Set Key completion roam_status =%d roam_result=%d "
 		  MAC_ADDRESS_STR, roam_status, roam_result,
-		  MAC_ADDR_ARRAY(roam_info->peerMac.bytes));
+		  QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes));
 
 	connected = hdd_conn_get_connected_cipher_algo(sta_ctx,
 						       &algorithm);
@@ -3200,7 +3200,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						hdd_debug("sending connect indication to nl80211:for bssid "
 							 MAC_ADDRESS_STR
 							 " result:%d and Status:%d",
-							 MAC_ADDR_ARRAY
+							 QDF_MAC_ADDR_ARRAY
 							 (roam_info->bssid.bytes),
 							 roam_result, roam_status);
 
@@ -3338,12 +3338,12 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 		if (roam_info)
 			hdd_err("wlan: connection failed with " MAC_ADDRESS_STR
 				 " result: %d and Status: %d",
-				 MAC_ADDR_ARRAY(roam_info->bssid.bytes),
+				 QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes),
 				 roam_result, roam_status);
 		else
 			hdd_err("wlan: connection failed with " MAC_ADDRESS_STR
 				 " result: %d and Status: %d",
-				 MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes),
+				 QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes),
 				 roam_result, roam_status);
 
 		if ((eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE == roam_result) ||
@@ -3377,7 +3377,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				hdd_err("send connect failure to nl80211: for bssid "
 					MAC_ADDRESS_STR
 					" result: %d and Status: %d reasoncode: %d",
-					MAC_ADDR_ARRAY(roam_info->bssid.bytes),
+					QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes),
 					roam_result, roam_status,
 					roam_info->reasonCode);
 				sta_ctx->conn_info.assoc_status_code =
@@ -3386,7 +3386,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				hdd_err("connect failed: for bssid "
 				       MAC_ADDRESS_STR
 				       " result: %d and status: %d ",
-				       MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes),
+				       QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes),
 				       roam_result, roam_status);
 			}
 			hdd_debug("Invoking packetdump deregistration API");
@@ -3547,7 +3547,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 			/* we created the IBSS, notify supplicant */
 			hdd_debug("%s: created ibss " MAC_ADDRESS_STR,
 				adapter->dev->name,
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 					roam_info->pBssDesc->bssId));
 
 			/* we must first give cfg80211 the BSS information */
@@ -3881,8 +3881,8 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 		hdd_debug("IBSS New Peer indication from SME "
 			 "with peerMac " MAC_ADDRESS_STR " BSSID: "
 			 MAC_ADDRESS_STR " and stationID= %d",
-			 MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
-			 MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
+			 QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
+			 QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
 			 roam_info->staId);
 
 		if (!hdd_save_peer
@@ -3969,8 +3969,8 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 		hdd_debug("IBSS Peer Departed from SME "
 			 "with peerMac " MAC_ADDRESS_STR " BSSID: "
 			 MAC_ADDRESS_STR " and stationID= %d",
-			 MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
-			 MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
+			 QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
+			 QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
 			 roam_info->staId);
 
 		hdd_roam_deregister_sta(adapter, roam_info->staId);
@@ -4246,7 +4246,7 @@ hdd_indicate_cckm_pre_auth(struct hdd_adapter *adapter,
 
 	/* Timestamp0 is lower 32 bits and Timestamp1 is upper 32 bits */
 	hdd_debug("CCXPREAUTHNOTIFY=" MAC_ADDRESS_STR " %d:%d",
-		 MAC_ADDR_ARRAY(roam_info->bssid.bytes),
+		 QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes),
 		 roam_info->timestamp[0], roam_info->timestamp[1]);
 
 	nBytes = snprintf(pos, freeBytes, "CCXPREAUTHNOTIFY=");
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 38cb0d9770f8..21d76bf76460 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -3804,7 +3804,7 @@ static int hdd_set_bssid_prefs(struct hdd_context *hdd_ctx,
 			  tb2[PARAM_ROAM_BSSID],
 			  QDF_MAC_ADDR_SIZE);
 		hdd_debug(MAC_ADDRESS_STR,
-			  MAC_ADDR_ARRAY(roam_params->bssid_favored[i].bytes));
+			  QDF_MAC_ADDR_ARRAY(roam_params->bssid_favored[i].bytes));
 		/* Parse and fetch preference factor*/
 		if (!tb2[PARAM_RSSI_MODIFIER]) {
 			hdd_err("BSSID Preference score failed");
@@ -3890,7 +3890,7 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx,
 			nla_memcpy(roam_params->bssid_avoid_list[i].bytes,
 				   tb2[PARAM_SET_BSSID], QDF_MAC_ADDR_SIZE);
 			hdd_debug(MAC_ADDRESS_STR,
-				  MAC_ADDR_ARRAY(roam_params->bssid_avoid_list[i].bytes));
+				  QDF_MAC_ADDR_ARRAY(roam_params->bssid_avoid_list[i].bytes));
 			i++;
 		}
 	}
@@ -7817,7 +7817,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 	nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR],
 			QDF_MAC_ADDR_SIZE);
 	hdd_debug("input src mac address: "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(add_req->mac_address.bytes));
+			QDF_MAC_ADDR_ARRAY(add_req->mac_address.bytes));
 
 	if (!qdf_is_macaddr_equal(&add_req->mac_address,
 				  &adapter->mac_addr)) {
@@ -7831,7 +7831,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 	}
 	nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE);
 	hdd_debug("input dst mac address: "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(dst_addr.bytes));
+			QDF_MAC_ADDR_ARRAY(dst_addr.bytes));
 
 	if (!tb[PARAM_IP_PACKET]) {
 		hdd_err("attr ip packet failed");
@@ -7941,7 +7941,8 @@ wlan_hdd_del_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 		return -ENOMEM;
 
 	qdf_copy_macaddr(&del_req->mac_address, &adapter->mac_addr);
-	hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(del_req->mac_address.bytes));
+	hdd_debug(MAC_ADDRESS_STR,
+		  QDF_MAC_ADDR_ARRAY(del_req->mac_address.bytes));
 	del_req->ucPtrnId = pattern_id;
 	hdd_debug("Request Id: %u Pattern id: %d",
 			 request_id, del_req->ucPtrnId);
@@ -8631,7 +8632,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	qdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]),
 		     QDF_MAC_ADDR_SIZE);
 	hdd_debug("peerMac="MAC_ADDRESS_STR" for device_mode:%d",
-	       MAC_ADDR_ARRAY(peer_mac), adapter->device_mode);
+		  QDF_MAC_ADDR_ARRAY(peer_mac), adapter->device_mode);
 
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
@@ -8641,7 +8642,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		    qdf_mem_cmp(hdd_sta_ctx->conn_info.bssid.bytes,
 			peer_mac, QDF_MAC_ADDR_SIZE)) {
 			hdd_err("Not Associated to mac "MAC_ADDRESS_STR,
-			       MAC_ADDR_ARRAY(peer_mac));
+			       QDF_MAC_ADDR_ARRAY(peer_mac));
 			return -EINVAL;
 		}
 
@@ -8664,7 +8665,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 
 		if (WLAN_MAX_STA_COUNT == sta_id) {
 			hdd_err("No active peer with mac="MAC_ADDRESS_STR,
-			       MAC_ADDR_ARRAY(peer_mac));
+			       QDF_MAC_ADDR_ARRAY(peer_mac));
 			return -EINVAL;
 		}
 
@@ -8674,7 +8675,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		rate_flags = adapter->sta_info[sta_id].rate_flags;
 	} else {
 		hdd_err("Not Associated! with mac "MAC_ADDRESS_STR,
-		       MAC_ADDR_ARRAY(peer_mac));
+		       QDF_MAC_ADDR_ARRAY(peer_mac));
 		return -EINVAL;
 	}
 
@@ -14256,7 +14257,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 				       QDF_MAC_ADDR_SIZE);
 				pr_info("wlan: Generated HotSpot BSSID "
 					MAC_ADDRESS_STR "\n",
-					MAC_ADDR_ARRAY(ndev->dev_addr));
+					QDF_MAC_ADDR_ARRAY(ndev->dev_addr));
 			}
 
 			hdd_set_ap_ops(adapter->dev);
@@ -15052,8 +15053,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 			     params->key, params->key_len);
 
 		hdd_debug("Set key for peerMac "MAC_ADDRESS_STR" direction %d",
-		       MAC_ADDR_ARRAY(set_key.peerMac.bytes),
-		       set_key.keyDirection);
+			  QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes),
+			  set_key.keyDirection);
 
 		/* The supplicant may attempt to set the PTK once
 		 * pre-authentication is done. Save the key in the
@@ -15106,7 +15107,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 			qdf_set_macaddr_broadcast(&set_key.peerMac);
 
 			hdd_debug("Set key peerMac "MAC_ADDRESS_STR" direction %d",
-			       MAC_ADDR_ARRAY(set_key.peerMac.bytes),
+			       QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes),
 			       set_key.keyDirection);
 
 			status = sme_roam_set_key(mac_handle,
@@ -15606,7 +15607,7 @@ void wlan_hdd_cfg80211_unlink_bss(struct hdd_adapter *adapter,
 		hdd_err("BSS not present");
 	} else {
 		hdd_debug("cfg80211_unlink_bss called for BSSID "
-			MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bssid));
+			MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(bssid));
 		cfg80211_unlink_bss(wiphy, bss);
 		/* cfg80211_get_bss get bss with ref count so release it */
 		cfg80211_put_bss(wiphy, bss);
@@ -15773,7 +15774,7 @@ wlan_hdd_inform_bss_frame(struct hdd_adapter *adapter,
 		bss_data.per_chain_rssi[i] = WLAN_INVALID_PER_CHAIN_RSSI;
 
 	hdd_debug("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d TSF %u seq %d",
-		  MAC_ADDR_ARRAY(bss_data.mgmt->bssid),
+		  QDF_MAC_ADDR_ARRAY(bss_data.mgmt->bssid),
 		  bss_data.chan->center_freq, (int)(bss_data.rssi / 100),
 		  bss_desc->timeStamp[0], ((bss_desc->seq_ctrl.seqNumHi <<
 		  HIGH_SEQ_NUM_OFFSET) | bss_desc->seq_ctrl.seqNumLo));
@@ -15846,7 +15847,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
 		return -EINVAL;
 	}
 
-	hdd_info(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(roam_info->bssid.bytes));
+	hdd_info(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
 	cfg80211_pmksa_candidate_notify(dev, index,
 					roam_info->bssid.bytes,
 					preauth, GFP_KERNEL);
@@ -15886,7 +15887,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
 	wrqu.data.length = scnprintf(metrics_notification,
 				     sizeof(metrics_notification),
 				     "QCOM: LFR_PREAUTH_INIT " MAC_ADDRESS_STR,
-				     MAC_ADDR_ARRAY(roam_info->bssid.bytes));
+				     QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
 
 	wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
 			    metrics_notification);
@@ -15927,7 +15928,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
 
 	scnprintf(metrics_notification, sizeof(metrics_notification),
 		  "QCOM: LFR_PREAUTH_STATUS " MAC_ADDRESS_STR,
-		  MAC_ADDR_ARRAY(roam_info->bssid.bytes));
+		  QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
 
 	if (1 == preauth_status)
 		strlcat(metrics_notification, " true",
@@ -15979,7 +15980,7 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
 				     sizeof(metrics_notification),
 				     "QCOM: LFR_PREAUTH_HANDOVER "
 				     MAC_ADDRESS_STR,
-				     MAC_ADDR_ARRAY(roam_info->bssid.bytes));
+				     QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
 
 	wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
 			    metrics_notification);
@@ -18161,7 +18162,7 @@ static int wlan_hdd_reassoc_bssid_hint(struct hdd_adapter *adapter,
 
 	if (bssid && channel && req->prev_bssid) {
 		hdd_debug("REASSOC Attempt on channel %d to " MAC_ADDRESS_STR,
-			  channel, MAC_ADDR_ARRAY(bssid));
+			  channel, QDF_MAC_ADDR_ARRAY(bssid));
 		/*
 		 * Save BSSID in a separate variable as
 		 * roam_profile's BSSID is getting zeroed out in the
@@ -18320,7 +18321,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
 
 	if (bssid && hdd_get_adapter_by_macaddr(hdd_ctx, (uint8_t *)bssid)) {
 		hdd_err("adapter exist with same mac address " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(bssid));
+			QDF_MAC_ADDR_ARRAY(bssid));
 		return -EINVAL;
 	}
 
@@ -19503,7 +19504,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 
 					hdd_debug("Delete STA with MAC::"
 						  MAC_ADDRESS_STR,
-					       MAC_ADDR_ARRAY(mac));
+					       QDF_MAC_ADDR_ARRAY(mac));
 
 					if (hdd_ctx->dev_dfs_cac_status ==
 							DFS_CAC_IN_PROGRESS)
@@ -19535,7 +19536,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				hdd_debug("Skip DEL STA as this is not used::"
 					  MAC_ADDRESS_STR,
-				       MAC_ADDR_ARRAY(mac));
+				       QDF_MAC_ADDR_ARRAY(mac));
 				return -ENOENT;
 			}
 
@@ -19543,14 +19544,14 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			    true) {
 				hdd_debug("Skip DEL STA as deauth is in progress::"
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(mac));
+					  QDF_MAC_ADDR_ARRAY(mac));
 				return -ENOENT;
 			}
 
 			adapter->sta_info[sta_id].is_deauth_in_progress = true;
 
 			hdd_debug("ucast, Delete STA with MAC:" MAC_ADDRESS_STR,
-				  MAC_ADDR_ARRAY(mac));
+				  QDF_MAC_ADDR_ARRAY(mac));
 
 			/* Case: SAP in ACS selected DFS ch and client connected
 			 * Now Radar detected. Then if random channel is another
@@ -19574,7 +19575,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 					false;
 				hdd_debug("STA removal failed for ::"
 					  MAC_ADDRESS_STR,
-				       MAC_ADDR_ARRAY(mac));
+				       QDF_MAC_ADDR_ARRAY(mac));
 				return -ENOENT;
 			}
 			qdf_status = qdf_wait_for_event_completion(
@@ -19723,7 +19724,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
 	set = params->sta_flags_set;
 
 	hdd_debug("mask 0x%x set 0x%x " MAC_ADDRESS_STR, mask, set,
-		MAC_ADDR_ARRAY(mac));
+		  QDF_MAC_ADDR_ARRAY(mac));
 
 	if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
 		if (set & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
@@ -19905,7 +19906,7 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter,
 	if (pmksa->bssid) {
 		hdd_debug("%s PMKSA for " MAC_ADDRESS_STR,
 			  is_delete ? "Delete" : "Set",
-			  MAC_ADDR_ARRAY(pmksa->bssid));
+			  QDF_MAC_ADDR_ARRAY(pmksa->bssid));
 		qdf_mem_copy(pmk_cache->BSSID.bytes,
 			     pmksa->bssid, QDF_MAC_ADDR_SIZE);
 	} else {
@@ -19962,7 +19963,7 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter,
 	mac_handle_t mac_handle;
 
 	hdd_debug("%s PMKSA for " MAC_ADDRESS_STR, is_delete ? "Delete" : "Set",
-	MAC_ADDR_ARRAY(pmksa->bssid));
+		  QDF_MAC_ADDR_ARRAY(pmksa->bssid));
 	qdf_mem_copy(pmk_cache->BSSID.bytes,
 				pmksa->bssid, QDF_MAC_ADDR_SIZE);
 
@@ -20131,7 +20132,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 	if (QDF_STATUS_SUCCESS !=
 	    wlan_hdd_del_pmksa_cache(adapter, &pmk_cache)) {
 		hdd_err("Failed to delete PMKSA for " MAC_ADDRESS_STR,
-		       MAC_ADDR_ARRAY(pmksa->bssid));
+		       QDF_MAC_ADDR_ARRAY(pmksa->bssid));
 		status = -EINVAL;
 	}
 
@@ -20662,7 +20663,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 			for (i = 0; i < params->n_acl_entries; i++) {
 				hdd_debug("** Add ACL MAC entry %i in WhiletList :"
 					MAC_ADDRESS_STR, i,
-					MAC_ADDR_ARRAY(
+					QDF_MAC_ADDR_ARRAY(
 						params->mac_addrs[i].addr));
 
 				qdf_mem_copy(&config->accept_mac[i],
@@ -20674,7 +20675,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 			for (i = 0; i < params->n_acl_entries; i++) {
 				hdd_debug("** Add ACL MAC entry %i in BlackList :"
 					MAC_ADDRESS_STR, i,
-					MAC_ADDR_ARRAY(
+					QDF_MAC_ADDR_ARRAY(
 						params->mac_addrs[i].addr));
 
 				qdf_mem_copy(&config->deny_mac[i],
diff --git a/core/hdd/src/wlan_hdd_debugfs_connect.c b/core/hdd/src/wlan_hdd_debugfs_connect.c
index 06ef6ab5b3be..957c35768933 100644
--- a/core/hdd/src/wlan_hdd_debugfs_connect.c
+++ b/core/hdd/src/wlan_hdd_debugfs_connect.c
@@ -368,7 +368,7 @@ wlan_hdd_connect_info_debugfs(struct hdd_adapter *adapter, uint8_t *buf,
 			    "last_auth_type = %s\n"
 			    "dot11mode = %s\n",
 			    conn_info->last_ssid.SSID.ssId,
-			    MAC_ADDR_ARRAY(conn_info->bssid.bytes),
+			    QDF_MAC_ADDR_ARRAY(conn_info->bssid.bytes),
 			    conn_info->connect_time,
 			    conn_info->auth_time,
 			    conn_info->freq,
diff --git a/core/hdd/src/wlan_hdd_debugfs_offload.c b/core/hdd/src/wlan_hdd_debugfs_offload.c
index 146da4d02600..a01bc0ef393b 100644
--- a/core/hdd/src/wlan_hdd_debugfs_offload.c
+++ b/core/hdd/src/wlan_hdd_debugfs_offload.c
@@ -99,7 +99,7 @@ wlan_hdd_mc_addr_list_info_debugfs(struct hdd_context *hdd_ctx,
 
 		ret = scnprintf(buf + length, buf_avail_len - length,
 				MAC_ADDRESS_STR "\n",
-				MAC_ADDR_ARRAY(mc_addr_list.mc_addr[i].bytes));
+				QDF_MAC_ADDR_ARRAY(mc_addr_list.mc_addr[i].bytes));
 		if (ret <= 0)
 			return length;
 		length += ret;
diff --git a/core/hdd/src/wlan_hdd_debugfs_roam.c b/core/hdd/src/wlan_hdd_debugfs_roam.c
index 2c15bb04050d..36d86ca6cc8f 100644
--- a/core/hdd/src/wlan_hdd_debugfs_roam.c
+++ b/core/hdd/src/wlan_hdd_debugfs_roam.c
@@ -478,14 +478,14 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx,
 					"\nSTA roamed from "
 					MAC_ADDRESS_STR " to "
 					MAC_ADDRESS_STR "\n",
-					MAC_ADDR_ARRAY(scan->old_bssid),
-					MAC_ADDR_ARRAY(scan->new_bssid));
+					QDF_MAC_ADDR_ARRAY(scan->old_bssid),
+					QDF_MAC_ADDR_ARRAY(scan->new_bssid));
 		} else {
 			ret = scnprintf(buf + length,
 					buf_avail_len - length,
 					"\nSTA is connected to " MAC_ADDRESS_STR
 					" before and after scan, not roamed\n",
-					MAC_ADDR_ARRAY(scan->old_bssid));
+					QDF_MAC_ADDR_ARRAY(scan->old_bssid));
 		}
 		if (ret <= 0)
 			goto free_mem;
@@ -527,7 +527,7 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx,
 			ret = scnprintf(buf + length,
 					buf_avail_len - length,
 					MAC_ADDRESS_STR " %4u  %3u   %3u\n",
-					MAC_ADDR_ARRAY(bssid),
+					QDF_MAC_ADDR_ARRAY(bssid),
 					scan->cand[rci].freq,
 					scan->cand[rci].score,
 					scan->cand[rci].rssi);
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index 64b394eea5c5..7220b635c709 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -433,7 +433,7 @@ wlan_hdd_cfg80211_extscan_cached_results_ind(struct hdd_context *hdd_ctx,
 				"Ie length %d",
 				ap->ts,
 				ap->ssid,
-				MAC_ADDR_ARRAY(ap->bssid.bytes),
+				QDF_MAC_ADDR_ARRAY(ap->bssid.bytes),
 				ap->channel,
 				ap->rssi,
 				ap->rtt,
@@ -595,7 +595,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(struct hdd_context *hdd_ctx,
 		       i,
 		       data->ap[i].ts,
 		       data->ap[i].ssid,
-		       MAC_ADDR_ARRAY(data->ap[i].bssid.bytes),
+		       QDF_MAC_ADDR_ARRAY(data->ap[i].bssid.bytes),
 		       data->ap[i].channel,
 		       data->ap[i].rssi,
 		       data->ap[i].rtt, data->ap[i].rtt_sd);
@@ -721,7 +721,7 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind(
 		       "Channel %u "
 		       "numOfRssi %d",
 		       i,
-		       MAC_ADDR_ARRAY(ap_info->bssid.bytes),
+		       QDF_MAC_ADDR_ARRAY(ap_info->bssid.bytes),
 		       ap_info->channel, ap_info->numOfRssi);
 		rssi = &(ap_info)->rssi[0];
 		for (j = 0; j < ap_info->numOfRssi; j++)
@@ -864,7 +864,7 @@ wlan_hdd_cfg80211_extscan_full_scan_result_event(struct hdd_context *hdd_ctx,
 	       "IE Length %d",
 	       data->ap.ts,
 	       data->ap.ssid,
-	       MAC_ADDR_ARRAY(data->ap.bssid.bytes),
+	       QDF_MAC_ADDR_ARRAY(data->ap.bssid.bytes),
 	       data->ap.channel,
 	       data->ap.rssi,
 	       data->ap.rtt,
@@ -1141,7 +1141,7 @@ wlan_hdd_cfg80211_extscan_epno_match_found(struct hdd_context *hdd_ctx,
 					"IE Length %d",
 					data->ap[i].ts,
 					data->ap[i].ssid,
-					MAC_ADDR_ARRAY(data->ap[i].bssid.bytes),
+					QDF_MAC_ADDR_ARRAY(data->ap[i].bssid.bytes),
 					data->ap[i].channel,
 					data->ap[i].rssi,
 					data->ap[i].rtt,
@@ -1247,7 +1247,7 @@ wlan_hdd_cfg80211_passpoint_match_found(void *ctx,
 					"IE Length %d",
 					data->ap.ts,
 					data->ap.ssid,
-					MAC_ADDR_ARRAY(data->ap.bssid.bytes),
+					QDF_MAC_ADDR_ARRAY(data->ap.bssid.bytes),
 					data->ap.channel,
 					data->ap.rssi,
 					data->ap.rtt,
@@ -1880,7 +1880,8 @@ static int hdd_parse_ap_rssi_threshold(struct nlattr *attr,
 		return -EINVAL;
 	}
 	nla_memcpy(ap->bssid.bytes, tb[id], QDF_MAC_ADDR_SIZE);
-	hdd_debug("BSSID: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(ap->bssid.bytes));
+	hdd_debug("BSSID: " MAC_ADDRESS_STR,
+		  QDF_MAC_ADDR_ARRAY(ap->bssid.bytes));
 
 	/* Parse and fetch low RSSI */
 	id = QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_LOW;
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 05dcdeea352c..2f2bf5cfd030 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -686,7 +686,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr)
 			return 0;
 		hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR,
 			adapter_temp->dev->name,
-			MAC_ADDR_ARRAY(mac_addr.bytes));
+			QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
 		return -EINVAL;
 	}
 
@@ -706,7 +706,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr)
 	}
 
 	hdd_info("Changing MAC to " MAC_ADDRESS_STR " of interface %s ",
-		 MAC_ADDR_ARRAY(mac_addr.bytes),
+		 QDF_MAC_ADDR_ARRAY(mac_addr.bytes),
 		 dev->name);
 	hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr);
 	memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN);
@@ -2128,7 +2128,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		       &sap_event->sapevt.sapStationMICFailureEvent.
 		       staMac, QDF_MAC_ADDR_SIZE);
 		hdd_debug("MIC MAC " MAC_ADDRESS_STR,
-		       MAC_ADDR_ARRAY(msg.src_addr.sa_data));
+			  QDF_MAC_ADDR_ARRAY(msg.src_addr.sa_data));
 		if (sap_event->sapevt.sapStationMICFailureEvent.
 		    multicast == true)
 			msg.flags = IW_MICFAILURE_GROUP;
@@ -2162,7 +2162,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		event = &sap_event->sapevt.sapStationAssocReassocCompleteEvent;
 		if (eSAP_STATUS_FAILURE == event->status) {
 			hdd_info("assoc failure: " MAC_ADDRESS_STR,
-				 MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+				 QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 			break;
 		}
 
@@ -2172,7 +2172,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		memcpy(wrqu.addr.sa_data,
 		       &event->staMac, QDF_MAC_ADDR_SIZE);
 		hdd_info("associated " MAC_ADDRESS_STR,
-			 MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+			 QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		we_event = IWEVREGISTERED;
 
 		if ((eCSR_ENCRYPT_TYPE_NONE == ap_ctx->encryption_type) ||
@@ -2194,8 +2194,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 						event->wmmEnabled);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 				hdd_err("Failed to register STA %d "
-					  MAC_ADDRESS_STR "", qdf_status,
-				       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+					MAC_ADDRESS_STR "", qdf_status,
+					QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		} else {
 			qdf_status = hdd_softap_register_sta(
 						adapter,
@@ -2207,8 +2207,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 						event->wmmEnabled);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 				hdd_err("Failed to register STA %d "
-					  MAC_ADDRESS_STR "", qdf_status,
-				       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+					MAC_ADDRESS_STR "", qdf_status,
+					QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		}
 
 		sta_id = event->staId;
@@ -2326,7 +2326,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			cache_stainfo->disassoc_ts = qdf_system_ticks();
 		}
 		hdd_info(" disassociated " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+			 QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 
 		qdf_status = qdf_event_set(&hostapd_state->qdf_sta_disassoc_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -5475,7 +5475,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 #endif
 
 	hdd_debug("SOftAP macaddress : " MAC_ADDRESS_STR,
-	       MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
+		  QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
 	hdd_debug("ssid =%s, beaconint=%d, channel=%d",
 	       config->SSIDinfo.ssid.ssId, (int)config->beacon_int,
 	       (int)config->channel);
diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c
index a8eed8a90674..1a7dcc455128 100644
--- a/core/hdd/src/wlan_hdd_hostapd_wext.c
+++ b/core/hdd/src/wlan_hdd_hostapd_wext.c
@@ -283,7 +283,7 @@ static void print_mac_list(struct qdf_mac_addr *macList, uint8_t size)
 	for (i = 0; i < size; i++) {
 		macArray = (macList + i)->bytes;
 		pr_info("ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x\n",
-			i, MAC_ADDR_ARRAY(macArray));
+			i, QDF_MAC_ADDR_ARRAY(macArray));
 	}
 }
 
@@ -391,7 +391,7 @@ static int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value)
 		peer_mac =
 		    (uint8_t *)&(adapter->sta_info[aid].sta_mac.bytes[0]);
 		hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR,
-			 aid, MAC_ADDR_ARRAY(peer_mac));
+			 aid, QDF_MAC_ADDR_ARRAY(peer_mac));
 	} else {
 		hdd_err("No matching peer found for AID: %d", aid);
 		return -EINVAL;
@@ -1501,7 +1501,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
 	cmd = (int)(*(value + i));
 
 	hdd_debug("Modify ACL mac:" MAC_ADDRESS_STR " type: %d cmd: %d",
-	       MAC_ADDR_ARRAY(peer_mac), list_type, cmd);
+	       QDF_MAC_ADDR_ARRAY(peer_mac), list_type, cmd);
 
 	qdf_status = wlansap_modify_acl(
 		WLAN_HDD_GET_SAP_CTX_PTR(adapter),
@@ -1896,7 +1896,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 	peer_macaddr = (uint8_t *) (extra);
 
 	hdd_debug("data " MAC_ADDRESS_STR,
-		  MAC_ADDR_ARRAY(peer_macaddr));
+		  QDF_MAC_ADDR_ARRAY(peer_macaddr));
 	wlansap_populate_del_sta_params(peer_macaddr,
 					eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
 					(SIR_MAC_MGMT_DISASSOC >> 4),
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 227a55662554..5cd970f7ae95 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -1723,7 +1723,7 @@ static QDF_STATUS hdd_parse_plm_cmd(uint8_t *command,
 		}
 
 		hdd_debug("MAC addr " MAC_ADDRESS_STR,
-			  MAC_ADDR_ARRAY(req->mac_addr.bytes));
+			  QDF_MAC_ADDR_ARRAY(req->mac_addr.bytes));
 
 		in_ptr = strpbrk(in_ptr, " ");
 
@@ -5769,8 +5769,8 @@ static int drv_cmd_max_tx_power(struct hdd_adapter *adapter,
 		hdd_debug("Device mode %d max tx power %d selfMac: "
 			  MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR,
 			  adapter->device_mode, tx_power,
-			  MAC_ADDR_ARRAY(selfmac.bytes),
-			  MAC_ADDR_ARRAY(bssid.bytes));
+			  QDF_MAC_ADDR_ARRAY(selfmac.bytes),
+			  QDF_MAC_ADDR_ARRAY(bssid.bytes));
 
 		status = sme_set_max_tx_power(hdd_ctx->mac_handle,
 					      bssid, selfmac, tx_power);
@@ -6221,7 +6221,7 @@ static int hdd_set_rx_filter(struct hdd_adapter *adapter, bool action,
 				hdd_debug("%s RX filter : addr ="
 				    MAC_ADDRESS_STR,
 				    action ? "setting" : "clearing",
-				    MAC_ADDR_ARRAY(filter->multicastAddr[j].bytes));
+				    QDF_MAC_ADDR_ARRAY(filter->multicastAddr[j].bytes));
 				j++;
 			}
 			if (j == SIR_MAX_NUM_MULTICAST_ADDRESS)
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 7d6000eb4bc0..1a4f83307fa3 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -1216,7 +1216,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
 		hdd_ctx->num_provisioned_addr++;
 		hdd_info("hdd_ctx->provisioned_mac_addr[0]: "
 			 MAC_ADDRESS_STR,
-			 MAC_ADDR_ARRAY(hdd_ctx->
+			 QDF_MAC_ADDR_ARRAY(hdd_ctx->
 					provisioned_mac_addr[0].bytes));
 	} else {
 		qdf_mem_copy(hdd_ctx->derived_mac_addr[0].bytes,
@@ -1225,7 +1225,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
 		hdd_ctx->num_derived_addr++;
 		hdd_info("hdd_ctx->derived_mac_addr[0]: "
 			 MAC_ADDRESS_STR,
-			 MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[0].bytes));
+			 QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[0].bytes));
 	}
 	for (i = hdd_ctx->num_derived_addr; i < (QDF_MAX_CONCURRENCY_PERSONA -
 						hdd_ctx->num_provisioned_addr);
@@ -1248,7 +1248,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
 		hdd_ctx->derived_mac_addr[i].bytes[3] = macaddr_b3;
 		hdd_info("hdd_ctx->derived_mac_addr[%d]: "
 			MAC_ADDRESS_STR, i,
-			MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes));
+			QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes));
 		hdd_ctx->num_derived_addr++;
 	}
 }
@@ -3458,7 +3458,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
 			return 0;
 		hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR,
 			adapter_temp->dev->name,
-			MAC_ADDR_ARRAY(mac_addr.bytes));
+			QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
 		return -EINVAL;
 	}
 
@@ -3467,7 +3467,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
 		return -EINVAL;
 
 	hdd_info("Changing MAC to " MAC_ADDRESS_STR " of the interface %s ",
-		 MAC_ADDR_ARRAY(mac_addr.bytes), dev->name);
+		 QDF_MAC_ADDR_ARRAY(mac_addr.bytes), dev->name);
 
 	hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr);
 	memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN);
@@ -3513,7 +3513,7 @@ static uint8_t *wlan_hdd_get_derived_intf_addr(struct hdd_context *hdd_ctx)
 		return NULL;
 	qdf_atomic_set_bit(i, &hdd_ctx->derived_intf_addr_mask);
 	hdd_info("Assigning MAC from derived list" MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes));
+		 QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes));
 
 	/* Copy the mac in dynamic mac list at first free position */
 	for (j = 0; j < QDF_MAX_CONCURRENCY_PERSONA; j++) {
@@ -3544,7 +3544,7 @@ static uint8_t *wlan_hdd_get_provisioned_intf_addr(struct hdd_context *hdd_ctx)
 		return NULL;
 	qdf_atomic_set_bit(i, &hdd_ctx->provisioned_intf_addr_mask);
 	hdd_info("Assigning MAC from provisioned list" MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY(hdd_ctx->provisioned_mac_addr[i].bytes));
+		 QDF_MAC_ADDR_ARRAY(hdd_ctx->provisioned_mac_addr[i].bytes));
 
 	/* Copy the mac in dynamic mac list at first free position */
 	for (j = 0; j < QDF_MAX_CONCURRENCY_PERSONA; j++) {
@@ -3606,14 +3606,14 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx,
 				hdd_info("Releasing MAC from provisioned list");
 				hdd_info(
 					MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(releaseAddr));
+					QDF_MAC_ADDR_ARRAY(releaseAddr));
 			} else {
 				qdf_atomic_clear_bit(
 						mac_pos_in_mask, &hdd_ctx->
 						derived_intf_addr_mask);
 				hdd_info("Releasing MAC from derived list");
 				hdd_info(MAC_ADDRESS_STR,
-					 MAC_ADDR_ARRAY(releaseAddr));
+					 QDF_MAC_ADDR_ARRAY(releaseAddr));
 			}
 			qdf_zero_macaddr(&hdd_ctx->
 					    dynamic_mac_list[i].dynamic_mac);
@@ -3626,7 +3626,7 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx,
 	}
 	if (i == QDF_MAX_CONCURRENCY_PERSONA)
 		hdd_err("Releasing non existing MAC" MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(releaseAddr));
+			QDF_MAC_ADDR_ARRAY(releaseAddr));
 }
 
 /**
@@ -3692,7 +3692,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 		}
 		netdev_for_each_mc_addr(ha, dev) {
 			hdd_debug("ha_addr[%d] "MAC_ADDRESS_STR,
-				i, MAC_ADDR_ARRAY(ha->addr));
+				i, QDF_MAC_ADDR_ARRAY(ha->addr));
 			if (i == mc_count)
 				break;
 			memset(&(mc_list_request->mc_addr[i].bytes),
@@ -5035,7 +5035,7 @@ static void hdd_reset_locally_admin_bit(struct hdd_context *hdd_ctx,
 	 */
 	WLAN_HDD_RESET_LOCALLY_ADMINISTERED_BIT(mac_addr);
 	hdd_debug("locally administered bit reset in sta mode: "
-		 MAC_ADDRESS_STR, MAC_ADDR_ARRAY(mac_addr));
+		 MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_addr));
 }
 
 static void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work)
@@ -5097,7 +5097,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 	if (QDF_STATUS_E_FAILURE == status) {
 		hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR
 				" already exists",
-				MAC_ADDR_ARRAY(mac_addr));
+				QDF_MAC_ADDR_ARRAY(mac_addr));
 		return NULL;
 	}
 
@@ -5115,7 +5115,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 			if (QDF_STATUS_E_FAILURE == status) {
 				hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR
 					" already exists",
-					MAC_ADDR_ARRAY(mac_addr));
+					QDF_MAC_ADDR_ARRAY(mac_addr));
 				return NULL;
 			}
 		}
@@ -10236,7 +10236,7 @@ void hdd_populate_random_mac_addr(struct hdd_context *hdd_ctx, uint32_t num)
 		macaddr_b3 ^= (1 << INTF_MACADDR_MASK);
 		buf[0] |= 0x02;
 		buf[3] = macaddr_b3;
-		hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(buf));
+		hdd_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(buf));
 		hdd_ctx->num_derived_addr++;
 	}
 }
@@ -10277,7 +10277,7 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx)
 		buf = hdd_ctx->provisioned_mac_addr[iter].bytes;
 		qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE);
 		hdd_info("provisioned MAC Addr [%d]" MAC_ADDRESS_STR, iter,
-			 MAC_ADDR_ARRAY(buf));
+			 QDF_MAC_ADDR_ARRAY(buf));
 	}
 
 
@@ -10299,7 +10299,7 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx)
 			buf = hdd_ctx->derived_mac_addr[iter].bytes;
 			qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE);
 			hdd_debug("derived MAC Addr [%d]" MAC_ADDRESS_STR, iter,
-				  MAC_ADDR_ARRAY(buf));
+				  QDF_MAC_ADDR_ARRAY(buf));
 		}
 		hdd_ctx->num_derived_addr = no_of_mac_addr;
 	}
@@ -14691,7 +14691,7 @@ bool hdd_is_connection_in_progress(uint8_t *out_vdev_id,
 					&(adapter->mac_addr.bytes[0]);
 				hdd_debug("client " MAC_ADDRESS_STR
 					" is in middle of WPS/EAPOL exchange.",
-					MAC_ADDR_ARRAY(sta_mac));
+					QDF_MAC_ADDR_ARRAY(sta_mac));
 				if (out_vdev_id && out_reason) {
 					*out_vdev_id = adapter->vdev_id;
 					*out_reason = EAPOL_IN_PROGRESS;
@@ -14712,7 +14712,7 @@ bool hdd_is_connection_in_progress(uint8_t *out_vdev_id,
 							sta_mac.bytes[0]);
 				hdd_debug("client " MAC_ADDRESS_STR
 				" of SAP/GO is in middle of WPS/EAPOL exchange",
-				MAC_ADDR_ARRAY(sta_mac));
+				QDF_MAC_ADDR_ARRAY(sta_mac));
 				if (out_vdev_id && out_reason) {
 					*out_vdev_id = adapter->vdev_id;
 					*out_reason = SAP_EAPOL_IN_PROGRESS;
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index 2b05a470666e..478c658c9b8e 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -735,7 +735,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peer_mac,
 		  " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d),"
 		  " info (0x%x), frequency (%d),reg info 1 (0x%x),"
 		  " reg info 2 (0x%x)",
-		  MAC_ADDR_ARRAY(peer_mac->bytes),
+		  QDF_MAC_ADDR_ARRAY(peer_mac->bytes),
 		  peer_status, peer_capability,
 		  vdev_id, peer_info->peer_chan_info.chan_id,
 		  p_hdd_ctx->oem_pid,
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index 8b25e9f54c44..366832db9e59 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -993,7 +993,7 @@ void __hdd_indicate_mgmt_frame(struct hdd_adapter *adapter,
 			 * we are dropping action frame
 			 */
 			hdd_err("adapter for action frame is NULL Macaddr = "
-				MAC_ADDRESS_STR, MAC_ADDR_ARRAY(dest_addr));
+				MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(dest_addr));
 			hdd_debug("Frame Type = %d Frame Length = %d subType = %d",
 				  frame_type, frm_len, sub_type);
 			/*
diff --git a/core/hdd/src/wlan_hdd_rssi_monitor.c b/core/hdd/src/wlan_hdd_rssi_monitor.c
index 1033d58f1f27..ac57ca105218 100644
--- a/core/hdd/src/wlan_hdd_rssi_monitor.c
+++ b/core/hdd/src/wlan_hdd_rssi_monitor.c
@@ -207,7 +207,7 @@ void hdd_rssi_threshold_breached(hdd_handle_t hdd_handle,
 	hdd_debug("Req Id: %u Current rssi: %d",
 		  data->request_id, data->curr_rssi);
 	hdd_debug("Current BSSID: "MAC_ADDRESS_STR,
-		  MAC_ADDR_ARRAY(data->curr_bssid.bytes));
+		  QDF_MAC_ADDR_ARRAY(data->curr_bssid.bytes));
 
 	if (nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_RSSI_MONITORING_REQUEST_ID,
 			data->request_id) ||
diff --git a/core/hdd/src/wlan_hdd_station_info.c b/core/hdd/src/wlan_hdd_station_info.c
index 0790434b27b4..6d5ba3b9176a 100644
--- a/core/hdd/src/wlan_hdd_station_info.c
+++ b/core/hdd/src/wlan_hdd_station_info.c
@@ -937,7 +937,7 @@ static int hdd_get_cached_station_remote(struct hdd_context *hdd_ctx,
 
 	if (!stainfo) {
 		hdd_err("peer " MAC_ADDRESS_STR " not found",
-			MAC_ADDR_ARRAY(mac_addr.bytes));
+			QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
 		return -EINVAL;
 	}
 
@@ -1220,7 +1220,7 @@ __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy,
 			   QDF_MAC_ADDR_SIZE);
 
 		hdd_debug("STATION_REMOTE " MAC_ADDRESS_STR,
-			  MAC_ADDR_ARRAY(mac_addr.bytes));
+			  QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
 
 		status = hdd_get_station_remote(hdd_ctx, adapter, mac_addr);
 	} else {
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index aa8891722b91..059b51f5ad6d 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -571,7 +571,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 		    (!sta_ctx->conn_info.is_authenticated)) {
 			hdd_err("client " MAC_ADDRESS_STR
 				" is in the middle of WPS/EAPOL exchange.",
-				MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
+				QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
 			info->state = WIFI_AUTHENTICATING;
 		}
 		if (eConnectionState_Associated ==
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index e6e664b02cd0..59dbcb0b4f8b 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -8879,7 +8879,7 @@ static int __iw_set_keepalive_params(struct net_device *dev,
 		       request->destIpv4Addr[2], request->destIpv4Addr[3]);
 
 		hdd_debug("Dest MAC address: "MAC_ADDRESS_STR,
-		       MAC_ADDR_ARRAY(request->dest_macaddr.bytes));
+		       QDF_MAC_ADDR_ARRAY(request->dest_macaddr.bytes));
 		break;
 	}
 
diff --git a/core/mac/src/dph/dph_hash_table.c b/core/mac/src/dph/dph_hash_table.c
index 5f3745f61f2b..2f703d38a4f4 100644
--- a/core/mac/src/dph/dph_hash_table.c
+++ b/core/mac/src/dph/dph_hash_table.c
@@ -274,7 +274,7 @@ tpDphHashNode dph_add_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
 
 	pe_debug("assocId %d index %d STA addr",
 		       assocId, index);
-	pe_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staAddr));
+	pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr));
 
 	if (assocId >= hash_table->size) {
 		pe_err("invalid STA id %d", assocId);
@@ -346,7 +346,7 @@ QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
 	uint16_t index = hash_function(mac, staAddr, hash_table->size);
 
 	pe_debug("assocId %d index %d STA addr", assocId, index);
-	pe_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staAddr));
+	pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr));
 
 	if (assocId >= hash_table->size) {
 		pe_err("invalid STA id %d", assocId);
@@ -384,7 +384,7 @@ QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
 		ptr->next = 0;
 	} else {
 		pe_err("Entry not present STA addr");
-		pe_err(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staAddr));
+		pe_err(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr));
 		return QDF_STATUS_E_FAILURE;
 	}
 
diff --git a/core/mac/src/include/sir_debug.h b/core/mac/src/include/sir_debug.h
index 61d1e2821e7a..bee0003f8b5a 100644
--- a/core/mac/src/include/sir_debug.h
+++ b/core/mac/src/include/sir_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012, 2014-2015, 2017-2018 The Linux Foundation. All
+ * Copyright (c) 2011-2012, 2014-2015, 2017-2019 The Linux Foundation. All
  * rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -35,7 +35,6 @@
 #define LOG4    7
 #define LOGD    8
 
-#define MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
 #define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
 
 #define pe_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_PE, params)
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 428f12073318..bad330b2c3fa 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -695,7 +695,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 	pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "MAC_ADDRESS_STR,
 		pe_session->peSessionId, staDsAssocId,
 		mlmStaContext.cleanupTrigger, statusCode,
-		MAC_ADDR_ARRAY(sta_dsaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(sta_dsaddr.bytes));
 
 	if (LIM_IS_STA_ROLE(pe_session)) {
 		/* Set BSSID at CFG to null */
@@ -895,7 +895,7 @@ lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
 	pe_debug("Sessionid: %d auth_type: %d sub_type: %d add_pre_auth_context: %d sta_id: %d delete_sta: %d result_code : %d peer_addr: " MAC_ADDRESS_STR,
 		session_entry->peSessionId, auth_type, sub_type,
 		add_pre_auth_context, sta_id, delete_sta, result_code,
-		MAC_ADDR_ARRAY(peer_addr));
+		QDF_MAC_ADDR_ARRAY(peer_addr));
 
 	if (add_pre_auth_context) {
 		/* Create entry for this STA in pre-auth list */
@@ -2151,7 +2151,7 @@ lim_add_sta(struct mac_context *mac_ctx,
 		sta_Addr = &sta_mac;
 
 	pe_debug(MAC_ADDRESS_STR ": Subtype(Assoc/Reassoc): %d",
-		MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType);
+		QDF_MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType);
 
 	qdf_mem_copy((uint8_t *) add_sta_params->staMac,
 		     (uint8_t *) *sta_Addr, sizeof(tSirMacAddr));
@@ -2683,7 +2683,7 @@ lim_del_sta(struct mac_context *mac,
 		 "for STAID: %X and AssocID: %d MAC : "
 		 MAC_ADDRESS_STR, pDelStaParams->sessionId,
 		pDelStaParams->staIdx, pDelStaParams->assocId,
-		MAC_ADDR_ARRAY(sta->staAddr));
+		QDF_MAC_ADDR_ARRAY(sta->staAddr));
 
 	MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type));
 	retCode = wma_post_ctrl_msg(mac, &msgQ);
@@ -2744,7 +2744,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
 		(int)mac->roam.configParam.uCfgDot11Mode);
 
 	sir_copy_mac_addr(staMac, pe_session->selfMacAddr);
-	pe_debug(MAC_ADDRESS_STR ": ", MAC_ADDR_ARRAY(staMac));
+	pe_debug(MAC_ADDRESS_STR ": ", QDF_MAC_ADDR_ARRAY(staMac));
 	pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams));
 	if (!pAddStaParams)
 		return QDF_STATUS_E_NOMEM;
@@ -2902,7 +2902,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
 
 	pe_debug(MAC_ADDRESS_STR ":Sessionid %d : "
 			       "Sending WMA_ADD_STA_REQ. (aid %d)",
-		MAC_ADDR_ARRAY(pAddStaParams->staMac),
+		QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac),
 		pAddStaParams->sessionId, pAddStaParams->assocId);
 	MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type));
 
@@ -3371,7 +3371,7 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bssIdx,
 	pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ "
 			  "for bss idx: %X BSSID:" MAC_ADDRESS_STR,
 		       pDelBssParams->sessionId, pDelBssParams->bssIdx,
-		       MAC_ADDR_ARRAY(pe_session->bssId));
+		       QDF_MAC_ADDR_ARRAY(pe_session->bssId));
 	/* we need to defer the message until we get the response back from HAL. */
 	SET_LIM_PROCESS_DEFD_MESGS(mac, false);
 
@@ -3568,7 +3568,8 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 		pe_session->smeSessionId, updateEntry,
 		GET_LIM_SYSTEM_ROLE(pe_session));
 
-	pe_debug("BSSID: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pAddBssParams->bssId));
+	pe_debug("BSSID: " MAC_ADDRESS_STR,
+		 QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
 
 	pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE;
 
@@ -3743,7 +3744,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 	if (!sta) {
 		pe_err("Couldn't get assoc id for " "MAC ADDR: "
 			MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(
+			QDF_MAC_ADDR_ARRAY(
 				pAddBssParams->staContext.staMac));
 			return QDF_STATUS_E_FAILURE;
 	}
@@ -3758,7 +3759,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 
 	pe_debug("StaContext: " MAC_ADDRESS_STR
 			" shortPreambleSupported: %d",
-			MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
+			QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
 			pAddBssParams->staContext.shortPreambleSupported);
 
 	if (IS_DOT11_MODE_HT(pe_session->dot11mode)
@@ -4113,7 +4114,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 		GET_LIM_SYSTEM_ROLE(pe_session));
 
 	pe_debug("BSSID: " MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(pAddBssParams->bssId));
+		QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
 	/* Incorrect BSS Type which caused UMA Descriptor to be overwritten on
 	 * top of an already established Infra link. This lead to issues in
 	 * concurrent data transfer.
@@ -4295,7 +4296,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 	pAddBssParams->staContext.updateSta = updateEntry;
 
 	pe_debug("StaCtx: " MAC_ADDRESS_STR " shortPreamble: %d",
-			MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
+			QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
 			pAddBssParams->staContext.shortPreambleSupported);
 
 	pAddBssParams->dot11_mode = pe_session->dot11mode;
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 987cfd2a4fe7..d2a3f392b523 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -809,7 +809,7 @@ bool lim_process_ft_update_key(struct mac_context *mac, uint32_t *pMsgBuf)
 		pAddBssParams->extSetStaKeyParam.staIdx = 0;
 
 		pe_debug("BSSID: " MAC_ADDRESS_STR,
-			       MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));
+			       QDF_MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));
 
 		qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr,
 				 &pKeyInfo->bssid);
diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c
index f3e265bede0a..ba1951f1016d 100644
--- a/core/mac/src/pe/lim/lim_ft_preauth.c
+++ b/core/mac/src/pe/lim/lim_ft_preauth.c
@@ -143,7 +143,7 @@ int lim_process_ft_pre_auth_req(struct mac_context *mac_ctx,
 	if (!session) {
 		pe_err("Unable to find session for the bssid"
 			   MAC_ADDRESS_STR,
-			   MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId));
+			   QDF_MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId));
 		/* Post the FT Pre Auth Response to SME */
 		lim_post_ft_pre_auth_rsp(mac_ctx, QDF_STATUS_E_FAILURE, NULL, 0,
 					 session);
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 4fbf3440547c..c60922dae759 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1050,7 +1050,7 @@ lim_ibss_search_and_delete_peer(struct mac_context *mac_ctx,
 	prev_node = temp_node = mac_ctx->lim.gLimIbssPeerList;
 
 	pe_debug(" PEER ADDR :" MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(mac_addr));
+		QDF_MAC_ADDR_ARRAY(mac_addr));
 
 	/** Compare Peer */
 	while (temp_node) {
@@ -1110,7 +1110,7 @@ lim_ibss_delete_peer(struct mac_context *mac_ctx,
 	uint16_t peer_idx = 0;
 
 	pe_debug("Delete peer :" MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(mac_addr));
+		QDF_MAC_ADDR_ARRAY(mac_addr));
 
 	sta = dph_lookup_hash_entry(mac_ctx, mac_addr,
 			&peer_idx,
@@ -1176,7 +1176,7 @@ void lim_process_ibss_del_sta_rsp(struct mac_context *mac_ctx,
 	}
 	pe_debug("Deleted STA associd %d staId %d MAC " MAC_ADDRESS_STR,
 		sta_ds->assocId, sta_ds->staIndex,
-		MAC_ADDR_ARRAY(sta_ds->staAddr));
+		QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
 
 	lim_delete_dph_hash_entry(mac_ctx, sta_ds->staAddr,
 			  del_sta_params->assocId, pe_session);
@@ -1216,7 +1216,7 @@ lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_s
 				      &pe_session->dph.dphHashTable);
 	if (!sta) {
 		pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(pAddStaParams->staMac));
+			QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
 		qdf_mem_free(pAddStaParams);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1224,7 +1224,7 @@ lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_s
 	if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
 		pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"MAC_ADDRESS_STR,
 			pAddStaParams->status,
-			MAC_ADDR_ARRAY(pAddStaParams->staMac));
+			QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
 		lim_ibss_delete_peer(mac,
 			pe_session, pAddStaParams->staMac);
 		qdf_mem_free(pAddStaParams);
@@ -1449,8 +1449,8 @@ lim_ibss_coalesce(struct mac_context *mac,
 	sir_copy_mac_addr(currentBssId, pe_session->bssId);
 
 	pe_debug("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :"
-		   MAC_ADDRESS_STR, MAC_ADDR_ARRAY(currentBssId),
-		MAC_ADDR_ARRAY(pHdr->bssId));
+		   MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(currentBssId),
+		QDF_MAC_ADDR_ARRAY(pHdr->bssId));
 
 	/* Check for IBSS Coalescing only if Beacon is from different BSS */
 	if (qdf_mem_cmp(currentBssId, pHdr->bssId, sizeof(tSirMacAddr))
@@ -1485,7 +1485,7 @@ lim_ibss_coalesce(struct mac_context *mac,
 		mac->lim.gLimIbssCoalescingHappened = true;
 		ibss_coalesce_save(mac, pHdr, pBeacon);
 		pe_debug("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(currentBssId));
+			QDF_MAC_ADDR_ARRAY(currentBssId));
 		lim_ibss_bss_delete(mac, pe_session);
 
 		return QDF_STATUS_SUCCESS;
diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c
index d330c87f296e..3ae3f4c06973 100644
--- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c
+++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c
@@ -148,7 +148,7 @@ static void lim_delete_sta_util(struct mac_context *mac_ctx, tpDeleteStaContext
 					"STA that either has no context or "
 					"in some transit state, Addr = "
 					MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(msg->bssId));
+					QDF_MAC_ADDR_ARRAY(msg->bssId));
 			return;
 		}
 
@@ -422,7 +422,7 @@ lim_tear_down_link_with_ap(struct mac_context *mac, uint8_t sessionId,
 
 		pe_debug("HB Failure on MAC "
 			MAC_ADDRESS_STR" Store it on Index %d",
-			MAC_ADDR_ARRAY(sta->staAddr), apCount);
+			QDF_MAC_ADDR_ARRAY(sta->staAddr), apCount);
 
 		sir_copy_mac_addr(mac->lim.gLimHeartBeatApMac[apCount],
 							sta->staAddr);
diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
index 70d22c78f256..3ecf3c17f6d2 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
@@ -175,7 +175,7 @@ static QDF_STATUS lim_check_sta_in_pe_entries(struct mac_context *mac_ctx,
 				sta_ds->sta_deletion_in_progress = true;
 				pe_err("Sending Disassoc and Deleting existing STA entry:"
 					   MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(session->selfMacAddr));
+					QDF_MAC_ADDR_ARRAY(session->selfMacAddr));
 				lim_send_disassoc_mgmt_frame(mac_ctx,
 					eSIR_MAC_UNSPEC_FAILURE_REASON,
 					(uint8_t *) hdr->sa, session, false);
@@ -285,7 +285,7 @@ static bool lim_chk_assoc_req_parse_error(struct mac_context *mac_ctx,
 		return true;
 
 	pe_warn("Assoc Req rejected: frame parsing error. source addr:"
-			MAC_ADDRESS_STR, MAC_ADDR_ARRAY(hdr->sa));
+			MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa));
 	lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS,
 				      1, hdr->sa, sub_type, 0, session);
 	return false;
@@ -323,7 +323,7 @@ static bool lim_chk_capab(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		pe_warn("Rcvd %s Req with unsupported capab from"
 				MAC_ADDRESS_STR,
 			(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
-			MAC_ADDR_ARRAY(hdr->sa));
+			QDF_MAC_ADDR_ARRAY(hdr->sa));
 		/*
 		 * Capabilities of requesting STA does not match with
 		 * local capabilities. Respond with 'unsupported capabilities'
@@ -361,7 +361,7 @@ static bool lim_chk_ssid(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
 		assoc_req->ssId.length, assoc_req->ssId.ssId,
 		session->ssId.length, session->ssId.ssId,
-		MAC_ADDR_ARRAY(hdr->sa));
+		QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 	/*
 	 * Received Re/Association Request with either Broadcast SSID OR with
@@ -416,7 +416,7 @@ static bool lim_chk_rates(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	pe_warn("Assoc Req rejected: unsupported rates, soruce addr: %s"
 			MAC_ADDRESS_STR,
 		(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
-		MAC_ADDR_ARRAY(hdr->sa));
+		QDF_MAC_ADDR_ARRAY(hdr->sa));
 	/*
 	 * Requesting STA does not support ALL BSS basic rates. Respond with
 	 * 'basic rates not supported' status code.
@@ -448,7 +448,7 @@ static bool lim_chk_11g_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	    (assoc_req->HTCaps.present)) {
 		pe_err("SOFTAP was in 11G only mode, rejecting legacy STA: "
 				MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(hdr->sa));
+			QDF_MAC_ADDR_ARRAY(hdr->sa));
 		lim_send_assoc_rsp_mgmt_frame(mac_ctx,
 				eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
 				1, hdr->sa, sub_type, 0, session);
@@ -478,7 +478,7 @@ static bool lim_chk_11n_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	    (!assoc_req->HTCaps.present)) {
 		pe_err("SOFTAP was in 11N only mode, rejecting legacy STA: "
 				MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(hdr->sa));
+			QDF_MAC_ADDR_ARRAY(hdr->sa));
 		lim_send_assoc_rsp_mgmt_frame(mac_ctx,
 			eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
 			1, hdr->sa, sub_type, 0, session);
@@ -647,14 +647,14 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 							MAC_ADDRESS_STR,
 						(LIM_ASSOC == sub_type) ?
 							"Assoc" : "ReAssoc",
-						MAC_ADDR_ARRAY(hdr->sa));
+						QDF_MAC_ADDR_ARRAY(hdr->sa));
 				}
 				if (!assoc_req->supportedChannelsPresent) {
 					pe_warn("LIM Info: Missing Supported channel IE in %s Req from "
 							MAC_ADDRESS_STR,
 						(LIM_ASSOC == sub_type) ?
 							"Assoc" : "ReAssoc",
-						MAC_ADDR_ARRAY(hdr->sa));
+						QDF_MAC_ADDR_ARRAY(hdr->sa));
 				}
 			} else {
 				/* Assoc request has mandatory fields */
@@ -666,7 +666,7 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 						MAC_ADDRESS_STR,
 						(LIM_ASSOC == sub_type) ?
 							"Assoc" : "ReAssoc",
-						MAC_ADDR_ARRAY(hdr->sa));
+						QDF_MAC_ADDR_ARRAY(hdr->sa));
 				}
 				status = lim_is_dot11h_supported_channels_valid(
 							mac_ctx, assoc_req);
@@ -675,7 +675,7 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 						MAC_ADDRESS_STR,
 						(LIM_ASSOC == sub_type) ?
 							"Assoc" : "ReAssoc",
-						MAC_ADDR_ARRAY(hdr->sa));
+						QDF_MAC_ADDR_ARRAY(hdr->sa));
 				}
 				/* IEs are valid, use them if needed */
 			}
@@ -720,7 +720,7 @@ static bool lim_chk_mcs(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		pe_warn("rcvd %s req with unsupported MCS Rate Set from "
 				MAC_ADDRESS_STR,
 			(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
-			MAC_ADDR_ARRAY(hdr->sa));
+			QDF_MAC_ADDR_ARRAY(hdr->sa));
 		/*
 		 * Requesting STA does not support ALL BSS MCS basic Rate set
 		 * rates. Spec does not define any status code for this
@@ -972,13 +972,13 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 	qdf_mem_zero((uint8_t *) &dot11f_ie_rsn, sizeof(dot11f_ie_rsn));
 	qdf_mem_zero((uint8_t *) &dot11f_ie_wpa, sizeof(dot11f_ie_wpa));
 	pe_err("RSN enabled auth, Re/Assoc req from STA: "
-		MAC_ADDRESS_STR, MAC_ADDR_ARRAY(hdr->sa));
+		MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 	if (assoc_req->rsnPresent) {
 		if (!(assoc_req->rsn.length)) {
 			pe_warn("Re/Assoc rejected from: "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			/*
 			 * rcvd Assoc req frame with RSN IE but
 			 * length is zero
@@ -1011,7 +1011,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 			if (eSIR_MAC_SUCCESS_STATUS != status) {
 				pe_warn("Re/Assoc rejected from: "
 					MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(hdr->sa));
+					QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 				lim_send_assoc_rsp_mgmt_frame(mac_ctx, status,
 							 1, hdr->sa, sub_type,
@@ -1020,7 +1020,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 			}
 		} else {
 			pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			/*
 			 * rcvd Assoc req frame with RSN IE but
 			 * IE version is wrong
@@ -1038,7 +1038,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 		if (eSIR_MAC_SUCCESS_STATUS != status) {
 			/* Reject pmf disable SAE STA */
 			pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			lim_send_assoc_rsp_mgmt_frame(mac_ctx, status,
 						      1, hdr->sa, sub_type,
 						      0, session);
@@ -1049,7 +1049,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 		if (!(assoc_req->wpa.length)) {
 			pe_warn("Re/Assoc rejected from: "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 			/* rcvd Assoc req frame with invalid WPA IE length */
 			lim_send_assoc_rsp_mgmt_frame(mac_ctx,
@@ -1076,7 +1076,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
 		if (eSIR_MAC_SUCCESS_STATUS != status) {
 			pe_warn("Re/Assoc rejected from: "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			/*
 			 * rcvd Assoc req frame with WPA IE
 			 * but there is mismatch
@@ -1192,7 +1192,7 @@ static bool lim_process_assoc_req_no_sta_ctx(struct mac_context *mac_ctx,
 		pe_warn("rcvd %s req, sessionid: %d, without pre-auth ctx"
 				MAC_ADDRESS_STR,
 			(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
-			session->peSessionId, MAC_ADDR_ARRAY(hdr->sa));
+			session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa));
 		return false;
 	}
 	/* Delete 'pre-auth' context of STA */
@@ -1647,7 +1647,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		/* Could not update hash table entry at DPH with rateset */
 		pe_err("Couldn't update hash entry for aid: %d MacAddr: "
 		       MAC_ADDRESS_STR,
-		       peer_idx, MAC_ADDR_ARRAY(hdr->sa));
+		       peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 		/* Release AID */
 		lim_release_peer_idx(mac_ctx, peer_idx, session);
@@ -2007,7 +2007,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
 	/* STA is Associated ! */
 	pe_debug("Received: %s Req  successful from " MAC_ADDRESS_STR,
 		 (sub_type == LIM_ASSOC) ? "Assoc" : "ReAssoc",
-		 MAC_ADDR_ARRAY(hdr->sa));
+		 QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 	/*
 	 * AID for this association will be same as the peer Index used in DPH
@@ -2036,7 +2036,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
 	if (!sta_ds) {
 		/* Could not add hash table entry at DPH */
 		pe_err("couldn't add hash entry at DPH for aid: %d MacAddr:"
-			   MAC_ADDRESS_STR, peer_idx, MAC_ADDR_ARRAY(hdr->sa));
+			   MAC_ADDRESS_STR, peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 		/* Release AID */
 		lim_release_peer_idx(mac_ctx, peer_idx, session);
@@ -2123,14 +2123,14 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 		   MAC_ADDRESS_STR,
 		(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
 		session->peSessionId, GET_LIM_SYSTEM_ROLE(session),
-		session->limMlmState, MAC_ADDR_ARRAY(hdr->sa));
+		session->limMlmState, QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 	if (LIM_IS_STA_ROLE(session)) {
 		pe_err("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type: %d for role: %d from: "
 			   MAC_ADDRESS_STR,
 			session->peSessionId, sub_type,
 			GET_LIM_SYSTEM_ROLE(session),
-			MAC_ADDR_ARRAY(hdr->sa));
+			QDF_MAC_ADDR_ARRAY(hdr->sa));
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 				   WMA_GET_RX_MPDU_DATA(rx_pkt_info),
 				   frame_len);
@@ -2141,7 +2141,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 			"role: %d from: "MAC_ADDRESS_STR" in limMlmState: %d",
 			session->peSessionId,
 			GET_LIM_SYSTEM_ROLE(session),
-			MAC_ADDR_ARRAY(hdr->sa),
+			QDF_MAC_ADDR_ARRAY(hdr->sa),
 			eLIM_MLM_WT_DEL_BSS_RSP_STATE);
 		return;
 	}
@@ -2160,7 +2160,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 			pe_err("STA is initiating Assoc Req after ACK lost. Do not process sessionid: %d sys sub_type=%d for role=%d from: "
 				MAC_ADDRESS_STR, session->peSessionId,
 			sub_type, GET_LIM_SYSTEM_ROLE(session),
-			MAC_ADDR_ARRAY(hdr->sa));
+			QDF_MAC_ADDR_ARRAY(hdr->sa));
 			return;
 		} else if (!sta_ds->rmfEnabled && (sub_type == LIM_REASSOC)) {
 			/*
@@ -2190,7 +2190,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 					MAC_ADDRESS_STR,
 				session->peSessionId, sub_type,
 				session->limSystemRole,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			return;
 		}
 	}
@@ -2224,7 +2224,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 		pe_err("Rcvd: %s Req, sessionid: %d from a BC/MC address"
 				MAC_ADDRESS_STR,
 			(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
-			session->peSessionId, MAC_ADDR_ARRAY(hdr->sa));
+			session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa));
 		return;
 	}
 
@@ -2578,7 +2578,7 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
 	pe_debug("Sessionid: %d ssid: %s sub_type: %d Associd: %d staAddr: "
 		 MAC_ADDRESS_STR, session_entry->peSessionId,
 		assoc_req->ssId.ssId, sub_type, sta_ds->assocId,
-		MAC_ADDR_ARRAY(sta_ds->staAddr));
+		QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
 
 	if (sub_type == LIM_ASSOC || sub_type == LIM_REASSOC) {
 		temp = sizeof(tLimMlmAssocInd);
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index 88d2c1ce7e46..4222f857ad88 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -518,7 +518,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 		session_entry->peSessionId, GET_LIM_SYSTEM_ROLE(session_entry),
 		session_entry->limMlmState,
 		(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)),
-		MAC_ADDR_ARRAY(hdr->sa));
+		QDF_MAC_ADDR_ARRAY(hdr->sa));
 
 	beacon = qdf_mem_malloc(sizeof(tSchBeaconStruct));
 	if (!beacon)
@@ -574,7 +574,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 			 * Ignore this and wait until Assoc Failure Timeout
 			 */
 			pe_warn("received AssocRsp from unexpected peer "MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			qdf_mem_free(beacon);
 			return;
 		}
@@ -588,7 +588,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 			 * Ignore this and wait until Reassoc Failure Timeout.
 			 */
 			pe_warn("received ReassocRsp from unexpected peer "MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(hdr->sa));
+				QDF_MAC_ADDR_ARRAY(hdr->sa));
 			qdf_mem_free(beacon);
 			return;
 		}
@@ -939,7 +939,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 		return;
 	}
 	pe_debug("Successfully Associated with BSS " MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY(hdr->sa));
+		 QDF_MAC_ADDR_ARRAY(hdr->sa));
 #ifdef FEATURE_WLAN_ESE
 	if (session_entry->eseContext.tsm.tsmInfo.state)
 		session_entry->eseContext.tsm.tsmMetrics.RoamingCount = 0;
@@ -1045,7 +1045,7 @@ assocReject:
 			MAC_ADDRESS_STR,
 			session_entry->limMlmState,
 			session_entry->peSessionId,
-			assoc_cnf.resultCode, MAC_ADDR_ARRAY(hdr->sa));
+			assoc_cnf.resultCode, QDF_MAC_ADDR_ARRAY(hdr->sa));
 		session_entry->limMlmState = eLIM_MLM_IDLE_STATE;
 		MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE,
 			session_entry->peSessionId,
diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c
index 3c7cfecf179d..3bc42a4af982 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -115,7 +115,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
 		pe_err("rx Auth frame for unsupported auth algorithm %d "
 			MAC_ADDRESS_STR,
 			rx_auth_frm_body->authAlgoNumber,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 
 		/*
 		 * Authenticator does not have WEP
@@ -405,7 +405,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 				QDF_MAC_ADDR_SIZE))) {
 			pe_debug("TODO:Ack for disassoc frame is pending Issue delsta for "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 					pMlmDisassocReq->peer_macaddr.bytes));
 			lim_process_disassoc_ack_timeout(mac_ctx);
 			is_connected = false;
@@ -418,7 +418,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 				QDF_MAC_ADDR_SIZE))) {
 			pe_debug("TODO:Ack for deauth frame is pending Issue delsta for "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 					pMlmDeauthReq->peer_macaddr.bytes));
 			lim_process_deauth_ack_timeout(mac_ctx);
 			is_connected = false;
@@ -572,7 +572,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 			pe_err("rx Auth frm for unsupported auth algo %d "
 				MAC_ADDRESS_STR,
 				rx_auth_frm_body->authAlgoNumber,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 
 			/*
 			 * Responding party does not support the
@@ -596,7 +596,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 		pe_err("received Authentication frame for unsupported auth algorithm %d "
 			MAC_ADDRESS_STR,
 			rx_auth_frm_body->authAlgoNumber,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 
 		/*
 		 * Responding party does not support the
@@ -683,7 +683,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 		 */
 
 		pe_warn("received Auth frame2 from unexpected peer"
-			MAC_ADDRESS_STR, MAC_ADDR_ARRAY(mac_hdr->sa));
+			MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		return;
 	}
 
@@ -724,7 +724,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 			pe_warn("rx Auth frame2 for unexpected auth algo %d"
 				MAC_ADDRESS_STR,
 				rx_auth_frm_body->authAlgoNumber,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			return;
 		}
 	}
@@ -737,7 +737,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 		pe_err("rx Auth frame from peer with failure code %d "
 			MAC_ADDRESS_STR,
 			rx_auth_frm_body->authStatusCode,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED,
 			rx_auth_frm_body->authStatusCode,
 			pe_session);
@@ -793,7 +793,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 			pe_err("rx Auth frm from peer for unsupported auth algo %d "
 						MAC_ADDRESS_STR,
 					rx_auth_frm_body->authAlgoNumber,
-					MAC_ADDR_ARRAY(mac_hdr->sa));
+					QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 
 			auth_frame->authAlgoNumber =
 				rx_auth_frm_body->authAlgoNumber;
@@ -897,7 +897,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 		pe_err("rx Auth frame3 from peer with auth algo number %d "
 			MAC_ADDRESS_STR,
 			rx_auth_frm_body->authAlgoNumber,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		/*
 		 * Received Authentication frame3 with algorithm other than
 		 * Shared Key authentication type. Reject with Auth frame4
@@ -923,7 +923,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 		if (!mac_hdr->fc.wep) {
 			pe_err("received Auth frame3 from peer with no WEP bit set "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/* WEP bit is not set in FC of Auth Frame3 */
 			auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
 			auth_frame->authTransactionSeqNumber =
@@ -941,7 +941,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 		if (!auth_node) {
 			pe_warn("received AuthFrame3 from peer that has no preauth context "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/*
 			 * No 'pre-auth' context exists for this STA that sent
 			 * an Authentication frame3. Send Auth frame4 with
@@ -961,7 +961,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 		if (auth_node->mlmState == eLIM_MLM_AUTH_RSP_TIMEOUT_STATE) {
 			pe_warn("auth response timer timedout for peer "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/*
 			 * Received Auth Frame3 after Auth Response timeout.
 			 * Reject by sending Auth Frame4 with
@@ -990,7 +990,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			pe_err("rx Auth frm3 from peer with status code %d "
 				MAC_ADDRESS_STR,
 				rx_auth_frm_body->authStatusCode,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 				return;
 		}
 		/*
@@ -1024,7 +1024,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 			return;
 		} else {
 			pe_warn("Challenge failure for peer "MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/*
 			 * Challenge Failure.
 			 * Send Authentication frame4 with 'challenge failure'
@@ -1060,7 +1060,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		pe_warn("received unexpected Auth frame4 from peer in state %d, addr "
 			MAC_ADDRESS_STR,
 			pe_session->limMlmState,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		return;
 	}
 
@@ -1074,7 +1074,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		pe_err("received Auth frame4 from peer with invalid auth algo %d"
 			MAC_ADDRESS_STR,
 			rx_auth_frm_body->authAlgoNumber,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		return;
 	}
 
@@ -1088,7 +1088,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		 */
 
 		pe_warn("received Auth frame4 from unexpected peer "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		return;
 	}
 
@@ -1103,7 +1103,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		pe_err("received Authentication frame from peer with invalid auth seq number %d "
 			MAC_ADDRESS_STR,
 			rx_auth_frm_body->authTransactionSeqNumber,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		return;
 	}
 
@@ -1138,7 +1138,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		 * Return Auth confirm with received failure code to SME
 		 */
 		pe_err("Authentication failure from peer "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(mac_hdr->sa));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 		lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED,
 				rx_auth_frm_body->authStatusCode,
 				pe_session);
@@ -1220,7 +1220,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 
 	pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "MAC_ADDRESS_STR" RSSI: %d",
 		 pe_session->peSessionId, GET_LIM_SYSTEM_ROLE(pe_session),
-		 pe_session->limMlmState, MAC_ADDR_ARRAY(mac_hdr->bssId),
+		 pe_session->limMlmState, QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
 		 (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)));
 
 	if (pe_session->prev_auth_seq_num == curr_seq_num &&
@@ -1341,7 +1341,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		if (!cfg_privacy_opt_imp) {
 			pe_err("received Authentication frame3 from peer that while privacy option is turned OFF "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/*
 			 * Privacy option is not implemented.
 			 * So reject Authentication frame received with
@@ -1370,7 +1370,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		if (!auth_node) {
 			pe_err("rx Auth frame with no preauth ctx with WEP bit set "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/*
 			 * No 'pre-auth' context exists for this STA
 			 * that sent an Authentication frame with FC
@@ -1398,7 +1398,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			pe_err("received Authentication frame from peer that is in state %d "
 				MAC_ADDRESS_STR,
 				auth_node->mlmState,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/*
 			 * Should not have received Authentication frame
 			 * with WEP bit set in FC in other states.
@@ -1458,7 +1458,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		if (decrypt_result == LIM_DECRYPT_ICV_FAIL) {
 			pe_err("received Authentication frame from peer that failed decryption: "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mac_hdr->sa));
+				QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			/* ICV failure */
 			lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa);
 			auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
@@ -1592,7 +1592,7 @@ QDF_STATUS lim_process_auth_frame_no_session(struct mac_context *mac, uint8_t *p
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd);
 
 	pe_debug("Auth Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)",
-		 MAC_ADDR_ARRAY(pHdr->bssId),
+		 QDF_MAC_ADDR_ARRAY(pHdr->bssId),
 		 (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(pBd)));
 
 	/* Auth frame has come on a new BSS, however, we need to find the session
diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c
index 3e693f4f39e1..633323167730 100644
--- a/core/mac/src/pe/lim/lim_process_deauth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c
@@ -150,12 +150,12 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 	pe_debug("Received Deauth frame for Addr: " MAC_ADDRESS_STR
 			"(mlm state = %s, sme state = %d systemrole = %d "
 			"RSSI = %d) with reason code %d [%s] from "
-			MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->da),
+			MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->da),
 			lim_mlm_state_str(pe_session->limMlmState),
 			pe_session->limSmeState,
 			GET_LIM_SYSTEM_ROLE(pe_session), frame_rssi,
 			reasonCode, lim_dot11_reason_str(reasonCode),
-			MAC_ADDR_ARRAY(pHdr->sa));
+			QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 	if (mac->mlme_cfg->gen.fatal_event_trigger &&
 	    (reasonCode != eSIR_MAC_UNSPEC_FAILURE_REASON &&
@@ -189,7 +189,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			/* Log error and ignore the frame */
 			pe_err("received Deauth frame with invalid reasonCode %d from "
 				       MAC_ADDRESS_STR, reasonCode,
-				       MAC_ADDR_ARRAY(pHdr->sa));
+				       QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 			break;
 		}
@@ -209,7 +209,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			/* Log error and ignore the frame */
 			pe_err("received Deauth frame with invalid reasonCode %d from "
 				       MAC_ADDRESS_STR, reasonCode,
-				       MAC_ADDR_ARRAY(pHdr->sa));
+				       QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 			break;
 		}
@@ -219,7 +219,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		pe_err("received Deauth frame with reasonCode %d in role %d from "
 			MAC_ADDRESS_STR, reasonCode,
 			GET_LIM_SYSTEM_ROLE(pe_session),
-			MAC_ADDR_ARRAY(pHdr->sa));
+			QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 		return;
 	}
@@ -274,8 +274,8 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			pe_debug("Rcv Deauth from unknown/different "
 				"AP while ReAssoc. Ignore " MAC_ADDRESS_STR
 				"limReAssocbssId : " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(pHdr->sa),
-				MAC_ADDR_ARRAY(pe_session->limReAssocbssId));
+				QDF_MAC_ADDR_ARRAY(pHdr->sa),
+				QDF_MAC_ADDR_ARRAY(pe_session->limReAssocbssId));
 			return;
 		}
 
@@ -286,8 +286,8 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			pe_debug("received DeAuth from the New AP to "
 				"which ReAssoc is sent " MAC_ADDRESS_STR
 				"pe_session->bssId: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(pHdr->sa),
-				MAC_ADDR_ARRAY(pe_session->bssId));
+				QDF_MAC_ADDR_ARRAY(pHdr->sa),
+				QDF_MAC_ADDR_ARRAY(pe_session->bssId));
 
 			lim_restore_pre_reassoc_state(mac,
 						      eSIR_SME_REASSOC_REFUSED,
@@ -304,7 +304,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		if (!IS_CURRENT_BSSID(mac, pHdr->bssId, pe_session)) {
 			pe_err("received DeAuth from an AP other "
 				"than we're trying to join. Ignore. "
-				MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->sa));
+				MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 			if (lim_search_pre_auth_list(mac, pHdr->sa)) {
 				pe_debug("Preauth entry exist. Deleting");
@@ -348,7 +348,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 			pe_debug("received Deauth frame state %X with failure "
 				"code %d from " MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 
 			lim_restore_from_auth_state(mac_ctx,
 				eSIR_SME_DEAUTH_WHILE_JOIN,
@@ -360,7 +360,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 			pe_debug("received Deauth frame state %X with "
 				"reasonCode=%d from " MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 			/* / Issue Deauth Indication to SME. */
 			qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr,
 				addr, sizeof(tSirMacAddr));
@@ -386,7 +386,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 			pe_debug("received Deauth frame state %X with "
 				"reasonCode=%d from " MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 			if (lim_search_pre_auth_list(mac_ctx, addr))
 				lim_delete_pre_auth_node(mac_ctx, addr);
 
@@ -423,7 +423,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 			pe_debug("Received Deauth frame in state %X with Reason "
 				"Code %d from Peer" MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 			return;
 
 		case eLIM_MLM_IDLE_STATE:
@@ -435,7 +435,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 					"reason code %d from Tdls peer"
 					MAC_ADDRESS_STR,
 					pe_session->limMlmState, rc,
-					MAC_ADDR_ARRAY(addr));
+					QDF_MAC_ADDR_ARRAY(addr));
 			lim_send_sme_tdls_del_sta_ind(mac_ctx, sta_ds,
 							pe_session,
 							rc);
@@ -465,21 +465,21 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
 			pe_err("received Deauth frame state %X with "
 				"reasonCode=%d from " MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 			break;
 
 		case eLIM_MLM_WT_FT_REASSOC_RSP_STATE:
 			pe_err("received Deauth frame in FT state %X with "
 				"reasonCode=%d from " MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 			break;
 
 		default:
 			pe_err("received Deauth frame in state %X with "
 				"reasonCode=%d from " MAC_ADDRESS_STR,
 				pe_session->limMlmState, rc,
-				MAC_ADDR_ARRAY(addr));
+				QDF_MAC_ADDR_ARRAY(addr));
 			return;
 		}
 		break;
diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
index b6636512d9e7..af6c285e7ba0 100644
--- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c
+++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
@@ -149,10 +149,10 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 	pe_debug("Received Disassoc frame for Addr: " MAC_ADDRESS_STR
 		 "(mlm state=%s, sme state=%d RSSI=%d),"
 		 "with reason code %d [%s] from " MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY(pHdr->da),
+		 QDF_MAC_ADDR_ARRAY(pHdr->da),
 		 lim_mlm_state_str(pe_session->limMlmState),
 		 pe_session->limSmeState, frame_rssi, reasonCode,
-		 lim_dot11_reason_str(reasonCode), MAC_ADDR_ARRAY(pHdr->sa));
+		 lim_dot11_reason_str(reasonCode), QDF_MAC_ADDR_ARRAY(pHdr->sa));
 	lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT,
 		pe_session, 0, reasonCode);
 
@@ -180,7 +180,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		 */
 		pe_err("received Disassoc frame from STA that does not have context"
 			"reasonCode=%d, addr " MAC_ADDRESS_STR,
-			reasonCode, MAC_ADDR_ARRAY(pHdr->sa));
+			reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa));
 		return;
 	}
 
@@ -246,7 +246,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		default:
 			/* Invalid reasonCode in received Disassociation frame */
 			pe_warn("received Disassoc frame with invalid reasonCode: %d from " MAC_ADDRESS_STR,
-				reasonCode, MAC_ADDR_ARRAY(pHdr->sa));
+				reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa));
 			break;
 		}
 	} else if (LIM_IS_STA_ROLE(pe_session) &&
@@ -262,7 +262,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			if (pe_session->gLimChannelSwitch.state !=
 			    eLIM_CHANNEL_SWITCH_IDLE) {
 				pe_err("Ignoring disassoc frame due to upcoming channel switch, from "MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(pHdr->sa));
+					QDF_MAC_ADDR_ARRAY(pHdr->sa));
 				return;
 			}
 			break;
@@ -276,7 +276,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		pe_err("received Disassoc frame with invalid reasonCode: %d in role:"
 				"%d in sme state: %d from " MAC_ADDRESS_STR, reasonCode,
 			GET_LIM_SYSTEM_ROLE(pe_session), pe_session->limSmeState,
-			MAC_ADDR_ARRAY(pHdr->sa));
+			QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 		return;
 	}
@@ -306,7 +306,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 
 		pe_err("received Disassoc frame from peer that is in state: %X, addr "MAC_ADDRESS_STR,
 			sta->mlmStaContext.mlmState,
-			       MAC_ADDR_ARRAY(pHdr->sa));
+			       QDF_MAC_ADDR_ARRAY(pHdr->sa));
 
 	} /* if (sta->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */
 
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index ca8d763d9af7..53677f589a2a 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -1756,7 +1756,7 @@ static void lim_process_messages(struct mac_context *mac_ctx,
 					pe_debug("bssId"
 						MAC_ADDRESS_STR
 						" ctWin=%d oppPsFlag=%d",
-						MAC_ADDR_ARRAY(
+						QDF_MAC_ADDR_ARRAY(
 							session_entry->bssId),
 						session_entry->p2pGoPsUpdate.ctWin,
 						session_entry->p2pGoPsUpdate.oppPsFlag);
diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
index 086a91cee2d7..9439116a26c1 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
@@ -74,7 +74,8 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 
 	pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " MAC_ADDRESS_STR,
 		reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session),
-		session->limMlmState, MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
+		session->limMlmState,
+		QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
 
 	if (LIM_IS_AP_ROLE(session) ||
 		(session->limMlmState !=
@@ -87,7 +88,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 
 		pe_warn("unexpect msg state: %X role: %d MAC" MAC_ADDRESS_STR,
 			session->limMlmState, GET_LIM_SYSTEM_ROLE(session),
-			MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
+			QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
 		lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState);
 		reassoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
 		reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
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 4219ce636e1c..0a569320135b 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
@@ -895,7 +895,7 @@ static QDF_STATUS lim_process_mlm_auth_req_sae(struct mac_context *mac_ctx,
 		sae_info->vdev_id,
 		sae_info->ssid.length,
 		sae_info->ssid.ssId,
-		MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes));
+		QDF_MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes));
 
 	msg.type = eWNI_SME_TRIGGER_SAE;
 	msg.bodyptr = sae_info;
@@ -973,7 +973,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg)
 		       "mlmstate %d from: " MAC_ADDRESS_STR
 		       " with authtype %d", session_id,
 		GET_LIM_SYSTEM_ROLE(session), session->limMlmState,
-		MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr),
+		QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr),
 		mac_ctx->lim.gpLimMlmAuthReq->authType);
 
 	sir_copy_mac_addr(curr_bssid, session->bssId);
@@ -997,7 +997,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg)
 	if (lim_is_preauth_ctx_exists(mac_ctx, session, &preauth_node)) {
 		pe_debug("Already have pre-auth context with peer: "
 		    MAC_ADDRESS_STR,
-		    MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr));
+		    QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr));
 		mlm_auth_cnf.resultCode = (tSirResultCodes)
 						eSIR_MAC_SUCCESS_STATUS;
 		goto end;
@@ -1156,7 +1156,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg
 		pe_warn("received unexpected MLM_ASSOC_CNF in state %X for role=%d, MAC addr= "
 			   MAC_ADDRESS_STR, session_entry->limMlmState,
 			GET_LIM_SYSTEM_ROLE(session_entry),
-			MAC_ADDR_ARRAY(mlm_assoc_req->peerMacAddr));
+			QDF_MAC_ADDR_ARRAY(mlm_assoc_req->peerMacAddr));
 		lim_print_mlm_state(mac_ctx, LOGW, session_entry->limMlmState);
 		mlm_assoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
 		mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
@@ -1255,7 +1255,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
 		   "mlmstate %d from: " MAC_ADDRESS_STR,
 		mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session),
 		session->limMlmState,
-		MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
 
 	qdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE);
 
@@ -1280,7 +1280,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
 
 			pe_debug("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR,
 				eSIR_SME_DEAUTH_STATUS,
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 					mlm_disassocreq->peer_macaddr.bytes));
 
 			sme_disassoc_rsp->messageType = eWNI_SME_DISASSOC_RSP;
@@ -1335,7 +1335,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
 		 * have context or in some transit state.
 		 */
 		pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
+			QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
 		if (stads)
 			pe_err("Sta MlmState: %d", stads->mlmStaContext.mlmState);
 
@@ -1543,7 +1543,7 @@ lim_process_mlm_disassoc_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 	mlm_disassoc_req = (tLimMlmDisassocReq *) msg_buf;
 	pe_debug("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR,
 		mlm_disassoc_req->sessionId,
-		MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes));
 
 	lim_process_mlm_disassoc_req_ntf(mac_ctx, QDF_STATUS_SUCCESS,
 					 (uint32_t *) msg_buf);
@@ -1592,7 +1592,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 		mlm_deauth_req->sessionId,
 		GET_LIM_SYSTEM_ROLE(session),
 		session->limMlmState,
-		MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
 	sir_copy_mac_addr(curr_bssId, session->bssId);
 
 	switch (GET_LIM_SYSTEM_ROLE(session)) {
@@ -1613,9 +1613,9 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 				pe_err("received MLM_DEAUTH_REQ with invalid BSS id "
 					   "Peer MAC: "MAC_ADDRESS_STR
 					   " CFG BSSID Addr : "MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(
+					QDF_MAC_ADDR_ARRAY(
 						mlm_deauth_req->peer_macaddr.bytes),
-					MAC_ADDR_ARRAY(curr_bssId));
+					QDF_MAC_ADDR_ARRAY(curr_bssId));
 				/*
 				 * Deauthentication response to host triggered
 				 * deauthentication
@@ -1629,7 +1629,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 
 				pe_debug("send deauth rsp with ret code %d for" MAC_ADDRESS_STR,
 					eSIR_SME_DEAUTH_STATUS,
-					MAC_ADDR_ARRAY(
+					QDF_MAC_ADDR_ARRAY(
 					  mlm_deauth_req->peer_macaddr.bytes));
 
 				sme_deauth_rsp->messageType =
@@ -1675,7 +1675,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 			pe_warn("received MLM_DEAUTH_REQ with in state %d for peer "
 				   MAC_ADDRESS_STR,
 				session->limMlmState,
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 					mlm_deauth_req->peer_macaddr.bytes));
 			lim_print_mlm_state(mac_ctx, LOGW,
 					    session->limMlmState);
@@ -1726,7 +1726,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 				   "does not have context, Addr="
 				   MAC_ADDRESS_STR,
 				session->limMlmState,
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 					mlm_deauth_req->peer_macaddr.bytes));
 			mlm_deauth_cnf.resultCode =
 				eSIR_SME_STA_NOT_AUTHENTICATED;
@@ -1751,7 +1751,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 		 * in some transit state
 		 */
 		pe_warn("Invalid MLM_DEAUTH_REQ, Addr="MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
+			QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
 		/* Prepare and Send LIM_MLM_DEAUTH_CNF */
 		mlm_deauth_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
 		goto end;
@@ -1835,7 +1835,7 @@ void lim_process_mlm_deauth_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 	pe_debug("Process Deauth Req on sessionID %d from: "
 		   MAC_ADDRESS_STR,
 		mlm_deauth_req->sessionId,
-		MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
 
 	session = pe_find_session_by_session_id(mac_ctx,
 				mlm_deauth_req->sessionId);
@@ -1918,7 +1918,7 @@ lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 					   &curr_bssid))) {
 			pe_debug("Received MLM_SETKEYS_REQ with invalid BSSID"
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mlm_set_keys_req->
+				QDF_MAC_ADDR_ARRAY(mlm_set_keys_req->
 						peer_macaddr.bytes));
 			/*
 			 * Prepare and Send LIM_MLM_SETKEYS_CNF with error code
@@ -1986,7 +1986,7 @@ lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 			 */
 			pe_debug("Invalid MLM_SETKEYS_REQ, Addr = "
 				   MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(mlm_set_keys_req->
+				QDF_MAC_ADDR_ARRAY(mlm_set_keys_req->
 						peer_macaddr.bytes));
 			/* Prepare and Send LIM_MLM_SETKEYS_CNF */
 			mlm_set_keys_cnf.resultCode =
@@ -2080,7 +2080,8 @@ void lim_process_join_failure_timeout(struct mac_context *mac_ctx)
 		/* Issue MLM join confirm with timeout reason code */
 		pe_err("Join Failure Timeout, In eLIM_MLM_WT_JOIN_BEACON_STATE session:%d "
 			   MAC_ADDRESS_STR,
-			session->peSessionId, MAC_ADDR_ARRAY(session->bssId));
+			session->peSessionId,
+			QDF_MAC_ADDR_ARRAY(session->bssId));
 
 		mlm_join_cnf.resultCode = eSIR_SME_JOIN_TIMEOUT_RESULT_CODE;
 		mlm_join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
@@ -2319,13 +2320,13 @@ lim_process_auth_rsp_timeout(struct mac_context *mac_ctx, uint32_t auth_idx)
 		if (auth_node->mlmState != eLIM_MLM_WT_AUTH_FRAME3_STATE) {
 			pe_err("received AUTH rsp timeout in unexpected "
 				   "state for MAC address: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(auth_node->peerMacAddr));
+				QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr));
 		} else {
 			auth_node->mlmState = eLIM_MLM_AUTH_RSP_TIMEOUT_STATE;
 			auth_node->fTimerStarted = 0;
 			pe_debug("AUTH rsp timedout for MAC address "
 				   MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(auth_node->peerMacAddr));
+				QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr));
 			/* Change timer to reactivate it in future */
 			lim_deactivate_and_change_per_sta_id_timer(mac_ctx,
 				eLIM_AUTH_RSP_TIMER, auth_node->authNodeIdx);
@@ -2384,7 +2385,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
 	pe_debug("Sessionid: %d try sending deauth on channel %d to BSSID: "
 		MAC_ADDRESS_STR, session->peSessionId,
 		session->currentOperChannel,
-		MAC_ADDR_ARRAY(session->bssId));
+		QDF_MAC_ADDR_ARRAY(session->bssId));
 	lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
 		session->bssId, session, false);
 
@@ -2422,7 +2423,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
 		/* To remove the preauth node in case of fail to associate */
 		if (lim_search_pre_auth_list(mac_ctx, session->bssId)) {
 			pe_debug("delete pre auth node for "MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(session->bssId));
+				QDF_MAC_ADDR_ARRAY(session->bssId));
 			lim_delete_pre_auth_node(mac_ctx,
 						 session->bssId);
 		}
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 495c889c5b95..2b36331728c2 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -997,7 +997,7 @@ static void lim_process_mlm_deauth_ind(struct mac_context *mac_ctx,
 					   &session_id);
 	if (!session) {
 		pe_err("session does not exist for Addr:" MAC_ADDRESS_STR,
-		       MAC_ADDR_ARRAY(deauth_ind->peerMacAddr));
+		       QDF_MAC_ADDR_ARRAY(deauth_ind->peerMacAddr));
 		return;
 	}
 	role = GET_LIM_SYSTEM_ROLE(session);
@@ -3146,7 +3146,7 @@ static void lim_process_switch_channel_join_req(
 				pe_err("Index %d Sessionid: %d Send deauth on "
 				"channel %d to BSSID: "MAC_ADDRESS_STR, apCount,
 				session_entry->peSessionId, session_entry->currentOperChannel,
-				MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription.
+				QDF_MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription.
 											bssId));
 
 				lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
@@ -3189,7 +3189,7 @@ static void lim_process_switch_channel_join_req(
 	pe_debug("Sessionid: %d Send Probe req on channel %d ssid:%.*s "
 		"BSSID: " MAC_ADDRESS_STR, session_entry->peSessionId,
 		session_entry->currentOperChannel, ssId.length, ssId.ssId,
-		MAC_ADDR_ARRAY(
+		QDF_MAC_ADDR_ARRAY(
 		session_entry->pLimMlmJoinReq->bssDescription.bssId));
 
 	/*
diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
index 53b6b9428521..ecac1021897d 100644
--- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
@@ -284,7 +284,7 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 				frame_len, &probe_req) == QDF_STATUS_E_FAILURE) {
 			pe_err("Parse error ProbeReq, length: %d, SA is: "
 					MAC_ADDRESS_STR, frame_len,
-					MAC_ADDR_ARRAY(mac_hdr->sa));
+					QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
 			return;
 		}
 		if (session->pePersona == QDF_P2P_GO_MODE) {
diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
index 38ba96c68d4a..f6adcd47a2c2 100644
--- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
@@ -129,7 +129,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info
 
 	pe_debug("Rx Probe Response with length = %d from "MAC_ADDRESS_STR,
 		WMA_GET_RX_MPDU_LEN(rx_Packet_info),
-		MAC_ADDR_ARRAY(header->sa));
+		QDF_MAC_ADDR_ARRAY(header->sa));
 
 	/* Validate IE information before processing Probe Response Frame */
 	if (lim_validate_ie_information_in_probe_rsp_frame(mac_ctx,
@@ -144,7 +144,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info
 	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 		FL("Probe Resp Frame Received: BSSID "
 		MAC_ADDRESS_STR " (RSSI %d)"),
-		MAC_ADDR_ARRAY(header->bssId),
+		QDF_MAC_ADDR_ARRAY(header->bssId),
 		(uint) abs((int8_t)WMA_GET_RX_RSSI_NORMALIZED(rx_Packet_info)));
 	/* Get pointer to Probe Response frame body */
 	body = WMA_GET_RX_MPDU_DATA(rx_Packet_info);
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 bc22f333d1a9..67f9746383c8 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
@@ -1027,7 +1027,7 @@ static void lim_update_sae_config(struct pe_session *session,
 
 	pe_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR,
 		session->sae_pmk_cached,
-		MAC_ADDR_ARRAY(sme_join_req->bssDescription.bssId));
+		QDF_MAC_ADDR_ARRAY(sme_join_req->bssDescription.bssId));
 }
 #else
 static inline void lim_update_sae_config(struct pe_session *session,
@@ -1298,7 +1298,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 			pe_err("Session(%d) Already exists for BSSID: "
 				   MAC_ADDRESS_STR " in limSmeState = %X",
 				session_id,
-				MAC_ADDR_ARRAY(bss_desc->bssId),
+				QDF_MAC_ADDR_ARRAY(bss_desc->bssId),
 				session->limSmeState);
 
 			if (session->limSmeState == eLIM_SME_LINK_EST_STATE &&
@@ -2066,7 +2066,7 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac,
 	if (!pe_session) {
 		pe_err("session does not exist for given bssId "
 			   MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes));
+			QDF_MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes));
 		retCode = eSIR_SME_INVALID_PARAMETERS;
 		disassocTrigger = eLIM_HOST_DISASSOC;
 		goto sendDisassoc;
@@ -2075,7 +2075,7 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac,
 			MAC_ADDRESS_STR, smesessionId,
 		GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode,
 		mac->lim.gLimSmeState,
-		MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes));
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM    /* FEATURE_WLAN_DIAG_SUPPORT */
 	lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_REQ_EVENT, pe_session,
@@ -2337,7 +2337,7 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
 		if (!sta) {
 			pe_err("DISASSOC_CNF for a STA with no context, addr= "
 				MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes));
+				QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes));
 			status = lim_prepare_disconnect_done_ind(mac, &msg,
 						pe_session->smeSessionId,
 						eSIR_SME_INVALID_PARAMETERS,
@@ -2354,7 +2354,7 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
 			(sta->mlmStaContext.mlmState ==
 				eLIM_MLM_WT_DEL_BSS_RSP_STATE)) {
 			pe_err("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d",
-				MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes),
+				QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes),
 				sta->mlmStaContext.mlmState);
 			status = lim_prepare_disconnect_done_ind(mac, &msg,
 						pe_session->smeSessionId,
@@ -2430,7 +2430,7 @@ static void __lim_process_sme_deauth_req(struct mac_context *mac_ctx,
 		MAC_ADDRESS_STR, sme_session_id,
 		GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode,
 		session_entry->limSmeState,
-		MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes));
+		QDF_MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM    /* FEATURE_WLAN_DIAG_SUPPORT */
 	lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_DEAUTH_REQ_EVENT,
 			session_entry, 0, sme_deauth_req.reasonCode);
@@ -3334,7 +3334,7 @@ static void __lim_process_sme_delts_req(struct mac_context *mac, uint32_t *pMsgB
 
 	pe_debug("Sent DELTS request to station with assocId = %d MacAddr = "
 		MAC_ADDRESS_STR,
-		pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));
+		pDeltsReq->aid, QDF_MAC_ADDR_ARRAY(peerMacAddr));
 
 	lim_send_delts_req_action_frame(mac, peerMacAddr,
 					pDeltsReq->req.wmeTspecPresent,
@@ -4267,14 +4267,14 @@ static void __lim_process_send_disassoc_frame(struct mac_context *mac_ctx,
 							  req->session_id);
 	if (!session_entry) {
 		pe_err("session does not exist for given bssId "
-		       MAC_ADDRESS_STR, MAC_ADDR_ARRAY(req->peer_mac));
+		       MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(req->peer_mac));
 		return;
 	}
 
 	pe_debug("msg_type->%d len->%d sess_id->%d mac->"
 		 MAC_ADDRESS_STR " reason->%d wait_for_ack->%d",
 		 req->msg_type, req->length,  req->session_id,
-		 MAC_ADDR_ARRAY(req->peer_mac), req->reason, req->wait_for_ack);
+		 QDF_MAC_ADDR_ARRAY(req->peer_mac), req->reason, req->wait_for_ack);
 
 	lim_send_disassoc_mgmt_frame(mac_ctx, req->reason, req->peer_mac,
 				     session_entry, req->wait_for_ack);
@@ -5339,7 +5339,7 @@ static void lim_process_modify_add_ies(struct mac_context *mac_ctx,
 	if (!session_entry) {
 		pe_err("Session not found for given bssid"
 					MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes));
+		QDF_MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes));
 		goto end;
 	}
 	if ((0 == modify_add_ies->modifyIE.ieBufferlength) ||
@@ -5430,7 +5430,7 @@ static void lim_process_update_add_ies(struct mac_context *mac_ctx,
 	if (!session_entry) {
 		pe_debug("Session not found for given bssid"
 			 MAC_ADDRESS_STR,
-			 MAC_ADDR_ARRAY(update_ie->bssid.bytes));
+			 QDF_MAC_ADDR_ARRAY(update_ie->bssid.bytes));
 		goto end;
 	}
 	addn_ie = &session_entry->add_ie_params;
@@ -5660,7 +5660,7 @@ static void lim_process_sme_dfs_csa_ie_request(struct mac_context *mac_ctx,
 			dfs_csa_ie_req->bssid, &session_id);
 	if (!session_entry) {
 		pe_err("Session not found for given BSSID" MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(dfs_csa_ie_req->bssid));
+			QDF_MAC_ADDR_ARRAY(dfs_csa_ie_req->bssid));
 		return;
 	}
 
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index 5cea90971a37..6355ae14df9d 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -426,9 +426,9 @@ static uint32_t lim_prepare_tdls_frame_header(struct mac_context *mac, uint8_t *
 		   MAC_ADDRESS_STR", A2:"MAC_ADDRESS_STR", A3:"
 		   MAC_ADDRESS_STR,
 		(tdlsLinkType == TDLS_LINK_AP) ? "AP" : "DIRECT",
-		MAC_ADDR_ARRAY(pMacHdr->addr1),
-		MAC_ADDR_ARRAY(pMacHdr->addr2),
-		MAC_ADDR_ARRAY(pMacHdr->addr3));
+		QDF_MAC_ADDR_ARRAY(pMacHdr->addr1),
+		QDF_MAC_ADDR_ARRAY(pMacHdr->addr2),
+		QDF_MAC_ADDR_ARRAY(pMacHdr->addr3));
 
 	if (pMacHdr->fc.subType == SIR_MAC_DATA_QOS_DATA) {
 		pMacHdr->qosControl.tid = tid;
@@ -638,7 +638,7 @@ static QDF_STATUS lim_send_tdls_dis_req_frame(struct mac_context *mac,
 	pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
 		SIR_MAC_TDLS_DIS_REQ,
 		lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_REQ),
-		MAC_ADDR_ARRAY(peer_mac.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
 
 	mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
 	lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -941,7 +941,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac,
 	pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="MAC_ADDRESS_STR,
 		SIR_MAC_TDLS_DIS_RSP,
 		lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_RSP),
-		MAC_ADDR_ARRAY(peer_mac.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
 
 	mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
 	lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1003,7 +1003,7 @@ static void populate_dotf_tdls_vht_aid(struct mac_context *mac, uint32_t selfDot
 				Aid->present = 0;
 				pe_err("sta is NULL for "
 					   MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(peerMac.bytes));
+					QDF_MAC_ADDR_ARRAY(peerMac.bytes));
 			}
 		}
 	} else {
@@ -1315,7 +1315,7 @@ QDF_STATUS lim_send_tdls_link_setup_req_frame(struct mac_context *mac,
 	pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
 		SIR_MAC_TDLS_SETUP_REQ,
 		lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_REQ),
-		MAC_ADDR_ARRAY(peer_mac.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
 
 	mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
 	lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1508,7 +1508,7 @@ QDF_STATUS lim_send_tdls_teardown_frame(struct mac_context *mac,
 		lim_trace_tdls_action_string(SIR_MAC_TDLS_TEARDOWN),
 		((reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP" :
 		    "DIRECT"),
-		MAC_ADDR_ARRAY(peer_mac.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
 
 	mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
 	lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1767,7 +1767,7 @@ static QDF_STATUS lim_send_tdls_setup_rsp_frame(struct mac_context *mac,
 	pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
 		SIR_MAC_TDLS_SETUP_RSP,
 		lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_RSP),
-		MAC_ADDR_ARRAY(peer_mac.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
 
 	mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
 	lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1974,7 +1974,7 @@ QDF_STATUS lim_send_tdls_link_setup_cnf_frame(struct mac_context *mac,
 	pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
 		SIR_MAC_TDLS_SETUP_CNF,
 		lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_CNF),
-	       MAC_ADDR_ARRAY(peer_mac.bytes));
+	       QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
 
 	mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
 	lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -2555,13 +2555,13 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
 
 	if (sta && pAddStaReq->tdls_oper == TDLS_OPER_ADD) {
 		pe_err("TDLS entry for peer: "MAC_ADDRESS_STR " already exist, cannot add new entry",
-			MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
+			QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
 			return QDF_STATUS_E_FAILURE;
 	}
 
 	if (sta && sta->staType != STA_ENTRY_TDLS_PEER) {
 		pe_err("Non TDLS entry for peer: "MAC_ADDRESS_STR " already exist",
-			MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
+			QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
 			return QDF_STATUS_E_FAILURE;
 	}
 
@@ -2570,7 +2570,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
 
 		if (!aid) {
 			pe_err("No more free AID for peer: "MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
+				QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
 			return QDF_STATUS_E_FAILURE;
 		}
 
@@ -2578,7 +2578,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
 		SET_PEER_AID_BITMAP(pe_session->peerAIDBitmap, aid);
 
 		pe_debug("Aid: %d, for peer: " MAC_ADDRESS_STR,
-			aid, MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
+			aid, QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
 		sta =
 			dph_get_hash_entry(mac, aid,
 					   &pe_session->dph.dphHashTable);
@@ -2633,7 +2633,7 @@ static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac,
 
 	if (sta) {
 		pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR,
-			 MAC_ADDR_ARRAY(sta->staAddr));
+			 QDF_MAC_ADDR_ARRAY(sta->staAddr));
 
 		pe_debug("STA type: %x, sta idx: %x resp_reqd: %d",
 			 sta->staType,
@@ -2643,7 +2643,7 @@ static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac,
 		status = lim_del_sta(mac, sta, resp_reqd, pe_session);
 	} else {
 		pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR" not found",
-			 MAC_ADDR_ARRAY(peerMac.bytes));
+			 QDF_MAC_ADDR_ARRAY(peerMac.bytes));
 	}
 
 	return status;
@@ -2711,7 +2711,7 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(struct mac_context *mac, void *msg,
 	SET_LIM_PROCESS_DEFD_MESGS(mac, true);
 	pe_debug("staIdx: %d, staMac: "MAC_ADDRESS_STR,
 	       pAddStaParams->staIdx,
-	       MAC_ADDR_ARRAY(pAddStaParams->staMac));
+	       QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
 
 	if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
 		QDF_ASSERT(0);
@@ -3111,7 +3111,7 @@ static void lim_check_aid_and_delete_peer(struct mac_context *p_mac,
 				goto skip;
 
 			pe_debug("Deleting "MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(stads->staAddr));
+				QDF_MAC_ADDR_ARRAY(stads->staAddr));
 
 			if (!lim_is_roam_synch_in_progress(session_entry)) {
 				lim_send_deauth_mgmt_frame(p_mac,
@@ -3126,7 +3126,7 @@ static void lim_check_aid_and_delete_peer(struct mac_context *p_mac,
 							 session_entry, false);
 				if (status != QDF_STATUS_SUCCESS)
 					pe_debug("peer "MAC_ADDRESS_STR" not found",
-						MAC_ADDR_ARRAY(stads->staAddr));
+						QDF_MAC_ADDR_ARRAY(stads->staAddr));
 			}
 
 			dph_delete_hash_entry(p_mac,
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c
index 81028d65ac4c..9af426bd23de 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -115,7 +115,7 @@ lim_collect_bss_description(struct mac_context *mac,
 
 	if (!pBssDescr->beaconInterval) {
 		pe_warn("Beacon Interval is ZERO, making it to default 100 "
-			   MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->bssId));
+			   MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->bssId));
 		pBssDescr->beaconInterval = 100;
 	}
 	/*
@@ -148,7 +148,7 @@ lim_collect_bss_description(struct mac_context *mac,
 	/* SINR no longer reported by HW */
 	pBssDescr->sinr = 0;
 	pe_debug(MAC_ADDRESS_STR " rssi: normalized: %d, absolute: %d",
-		MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi,
+		QDF_MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi,
 		pBssDescr->rssi_raw);
 
 	pBssDescr->received_time = (uint64_t)qdf_mc_timer_get_system_time();
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 28b0c76ac6e5..4fe354c4925c 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -2245,7 +2245,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 		 * 4 bytes each for IV & ICV.
 		 */
 		pe_debug("Sending encrypted auth frame to " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(peer_addr));
+				QDF_MAC_ADDR_ARRAY(peer_addr));
 
 		body_len = wep_challenge_len + LIM_ENCR_AUTH_INFO_LEN;
 		frame_len = sizeof(tSirMacMgmtHdr) + body_len;
@@ -2258,7 +2258,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 		auth_frame->authTransactionSeqNumber,
 		auth_frame->authStatusCode,
 		(auth_frame->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
-		MAC_ADDR_ARRAY(peer_addr));
+		QDF_MAC_ADDR_ARRAY(peer_addr));
 
 	switch (auth_frame->authTransactionSeqNumber) {
 	case SIR_MAC_AUTH_FRAME_1:
@@ -2394,7 +2394,7 @@ alloc_packet:
 		qdf_mem_copy(body, (uint8_t *) auth_frame, body_len);
 
 		pe_debug("Sending Auth seq# 3 to " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(mac_hdr->da));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->da));
 
 	} else {
 		*((uint16_t *) (body)) =
@@ -2485,7 +2485,7 @@ alloc_packet:
 			auth_frame->authStatusCode,
 			(auth_frame->authStatusCode ==
 				eSIR_MAC_SUCCESS_STATUS),
-			MAC_ADDR_ARRAY(mac_hdr->da));
+			QDF_MAC_ADDR_ARRAY(mac_hdr->da));
 	}
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE,
 			   QDF_TRACE_LEVEL_DEBUG,
@@ -2892,8 +2892,8 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
 	pe_debug("***Sessionid %d Sending Disassociation frame with "
 		   "reason %u and waitForAck %d to " MAC_ADDRESS_STR " ,From "
 		   MAC_ADDRESS_STR, pe_session->peSessionId, nReason,
-		waitForAck, MAC_ADDR_ARRAY(pMacHdr->da),
-		MAC_ADDR_ARRAY(pe_session->selfMacAddr));
+		waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da),
+		QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
 
 	if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
 	    || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
@@ -3068,8 +3068,8 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
 		       "reason %u and waitForAck %d to " MAC_ADDRESS_STR
 		       " ,From " MAC_ADDRESS_STR,
 		pe_session->peSessionId, nReason, waitForAck,
-		MAC_ADDR_ARRAY(pMacHdr->da),
-		MAC_ADDR_ARRAY(pe_session->selfMacAddr));
+		QDF_MAC_ADDR_ARRAY(pMacHdr->da),
+		QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
 
 	if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
 	    || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
@@ -3653,7 +3653,7 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
 	}
 
 	pe_debug("Send Ext channel Switch to :"MAC_ADDRESS_STR" with swcount %d, swmode %d , newchannel %d newops %d",
-		MAC_ADDR_ARRAY(mac_hdr->da),
+		QDF_MAC_ADDR_ARRAY(mac_hdr->da),
 		frm.ext_chan_switch_ann_action.switch_count,
 		frm.ext_chan_switch_ann_action.switch_mode,
 		frm.ext_chan_switch_ann_action.new_channel,
@@ -3807,7 +3807,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx,
 	}
 	pe_debug("Send frame on channel %d to mac "
 		MAC_ADDRESS_STR, session_entry->currentOperChannel,
-		MAC_ADDR_ARRAY(peer));
+		QDF_MAC_ADDR_ARRAY(peer));
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			session_entry->peSessionId, mac_hdr->fc.subType));
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index dd050281d496..4c91a7286cb4 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -659,7 +659,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
 		 * Initiate new entry for other session
 		 */
 		pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(peerMacAddr));
+			QDF_MAC_ADDR_ARRAY(peerMacAddr));
 
 		for (i = 0; i < mac->lim.maxBssId; i++) {
 			session = &mac->lim.gpSession[i];
@@ -706,7 +706,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
 		}
 		pe_debug("send eWNI_SME_DISASSOC_RSP with retCode: %d for "
 			 MAC_ADDRESS_STR,
-			 reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
+			 reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
 		pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP;
 		pSirSmeDisassocRsp->length = sizeof(struct disassoc_rsp);
 		pSirSmeDisassocRsp->sessionId = smesessionId;
@@ -747,7 +747,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
 		}
 		pe_debug("send eWNI_SME_DISASSOC_IND with retCode: %d for "
 			 MAC_ADDRESS_STR,
-			 reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
+			 reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
 		pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND;
 		pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
 		pSirSmeDisassocInd->sessionId = smesessionId;
@@ -919,7 +919,7 @@ lim_send_sme_tdls_del_sta_ind(struct mac_context *mac, tpDphHashNode sta,
 	struct tdls_event_info info;
 
 	pe_debug("Delete TDLS Peer "MAC_ADDRESS_STR "with reason code: %d",
-			MAC_ADDR_ARRAY(sta->staAddr), reasonCode);
+			QDF_MAC_ADDR_ARRAY(sta->staAddr), reasonCode);
 	info.vdev_id = pe_session->smeSessionId;
 	qdf_mem_copy(info.peermac.bytes, sta->staAddr, QDF_MAC_ADDR_SIZE);
 	info.message_type = TDLS_PEER_DISCONNECTED;
@@ -1046,7 +1046,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 			return;
 		pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for "
 			 MAC_ADDRESS_STR,
-			 reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
+			 reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
 		pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
 		pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp);
 		pSirSmeDeauthRsp->statusCode = reasonCode;
@@ -1084,7 +1084,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 			return;
 		pe_debug("send eWNI_SME_DEAUTH_IND with retCode: %d for "
 			 MAC_ADDRESS_STR,
-			 reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
+			 reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
 		pSirSmeDeauthInd->messageType = eWNI_SME_DEAUTH_IND;
 		pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd);
 		pSirSmeDeauthInd->reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
@@ -1961,7 +1961,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(struct mac_context *mac, tSirMacAddr pe
 	mmhMsg.type = pSmeMaxAssocInd->mesgType;
 	mmhMsg.bodyptr = pSmeMaxAssocInd;
 	pe_debug("msgType: %s peerMacAddr "MAC_ADDRESS_STR "sme session id %d",
-		"eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr),
+		"eWNI_SME_MAX_ASSOC_EXCEEDED", QDF_MAC_ADDR_ARRAY(peerMacAddr),
 		pSmeMaxAssocInd->sessionId);
 	MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
 			 smesessionId, mmhMsg.type));
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 67e106aab187..4976c54844fe 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -443,7 +443,7 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
 		filter->num_sta_sessions++;
 		sir_copy_mac_addr(filter->sta_bssid[session_id], *bssid);
 		pe_debug("Set filter for STA Session %d bssid "MAC_ADDRESS_STR,
-			session_id, MAC_ADDR_ARRAY(*bssid));
+			session_id, QDF_MAC_ADDR_ARRAY(*bssid));
 	} else if (eSIR_IBSS_MODE == bss_type) {
 		if (!ibss_ssid) {
 			pe_err("IBSS Type with NULL SSID");
@@ -640,7 +640,7 @@ struct pe_session *pe_create_session(struct mac_context *mac,
 		mac->mlme_cfg->obss_ht40.obss_color_collision_offload_enabled;
 
 	pe_debug("Create a new PE session: %d BSSID: "MAC_ADDRESS_STR" Max No of STA: %d",
-		*sessionId, MAC_ADDR_ARRAY(bssid), numSta);
+		*sessionId, QDF_MAC_ADDR_ARRAY(bssid), numSta);
 
 	if (eSIR_INFRA_AP_MODE == bssType || eSIR_IBSS_MODE == bssType) {
 		session_ptr->pSchProbeRspTemplate =
@@ -879,7 +879,7 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
 	pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "MAC_ADDRESS_STR,
 		session->peSessionId, session->operMode,
 		session->bssIdx,
-		MAC_ADDR_ARRAY(session->bssId));
+		QDF_MAC_ADDR_ARRAY(session->bssId));
 
 	lim_reset_bcn_probe_filter(mac_ctx, session);
 
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 351a41d57f75..5cc86de04efa 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -636,7 +636,7 @@ void lim_cleanup_mlm(struct mac_context *mac_ctx)
 
 void lim_print_mac_addr(struct mac_context *mac, tSirMacAddr macAddr, uint8_t logLevel)
 {
-	pe_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr));
+	pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macAddr));
 } /****** end lim_print_mac_addr() ******/
 
 /*
@@ -6613,7 +6613,7 @@ bool lim_is_valid_frame(last_processed_msg *last_processed_frm,
 	if (last_processed_frm->seq_num == seq_num &&
 		qdf_mem_cmp(last_processed_frm->sa, pHdr->sa, ETH_ALEN) == 0) {
 		pe_err("Duplicate frame from "MAC_ADDRESS_STR " Seq Number %d",
-		MAC_ADDR_ARRAY(pHdr->sa), seq_num);
+		QDF_MAC_ADDR_ARRAY(pHdr->sa), seq_num);
 		return false;
 	}
 	return true;
@@ -7587,7 +7587,7 @@ struct csr_roam_session *lim_get_session_by_macaddr(struct mac_context *mac_ctx,
 			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 				  FL("session %d exists with mac address "
 				  MAC_ADDRESS_STR), session->sessionId,
-				  MAC_ADDR_ARRAY(self_mac));
+				  QDF_MAC_ADDR_ARRAY(self_mac));
 
 			return session;
 		}
diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c
index d28b83f1119f..b9f014efc46c 100644
--- a/core/mac/src/pe/nan/nan_datapath.c
+++ b/core/mac/src/pe/nan/nan_datapath.c
@@ -73,7 +73,7 @@ static QDF_STATUS lim_add_ndi_peer(struct mac_context *mac_ctx,
 		return QDF_STATUS_SUCCESS;
 	}
 	pe_info("Need to create NDI Peer :" MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(peer_mac_addr.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_mac_addr.bytes));
 
 	peer_idx = lim_assign_peer_idx(mac_ctx, session);
 	if (!peer_idx) {
@@ -137,7 +137,7 @@ static void lim_ndp_delete_peer_by_addr(struct mac_context *mac_ctx, uint8_t vde
 	}
 
 	pe_info("deleting peer: "MAC_ADDRESS_STR" confirm rejected",
-		MAC_ADDR_ARRAY(peer_ndi_mac_addr.bytes));
+		QDF_MAC_ADDR_ARRAY(peer_ndi_mac_addr.bytes));
 
 	session = pe_find_session_by_sme_session_id(mac_ctx, vdev_id);
 	if (!session || (session->bssType != eSIR_NDI_MODE)) {
@@ -202,7 +202,7 @@ static void lim_ndp_delete_peers(struct mac_context *mac_ctx,
 	for (i = 0; i < num_peers; i++) {
 		pe_info("ndp_map[%d]: MAC: " MAC_ADDRESS_STR " num_active %d",
 			i,
-			MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes),
+			QDF_MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes),
 			ndp_map[i].num_active_ndp_sessions);
 
 		/* Do not delete a peer with active NDPs */
@@ -307,7 +307,7 @@ void lim_process_ndi_del_sta_rsp(struct mac_context *mac_ctx,
 	}
 	pe_info("Deleted STA AssocID %d staId %d MAC " MAC_ADDRESS_STR,
 		sta_ds->assocId, sta_ds->staIndex,
-		MAC_ADDR_ARRAY(sta_ds->staAddr));
+		QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
 
 	/*
 	 * Copy peer info in del peer indication before
@@ -509,7 +509,7 @@ void lim_ndp_add_sta_rsp(struct mac_context *mac_ctx, struct pe_session *session
 	if (!sta_ds) {
 		pe_err("NAN: ADD_STA_RSP for unknown MAC addr "
 			MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(add_sta_rsp->staMac));
+			QDF_MAC_ADDR_ARRAY(add_sta_rsp->staMac));
 		qdf_mem_free(add_sta_rsp);
 		return;
 	}
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index ed2a8f866e24..2dab9780efc0 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -1504,7 +1504,7 @@ QDF_STATUS lim_process_obss_detection_ind(struct mac_context *mac_ctx,
 	pe_debug("obss detect ind id %d, reason %d, msk 0x%x, " MAC_ADDRESS_STR,
 		 obss_detection->vdev_id, obss_detection->reason,
 		 obss_detection->matched_detection_masks,
-		 MAC_ADDR_ARRAY(obss_detection->matched_bssid_addr));
+		 QDF_MAC_ADDR_ARRAY(obss_detection->matched_bssid_addr));
 
 	session = pe_find_session_by_sme_session_id(mac_ctx,
 						    obss_detection->vdev_id);
diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
index 5450c286a7ce..1c3f3f48bfe1 100644
--- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
+++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
@@ -117,23 +117,23 @@ QDF_STATUS sys_bbt_process_message_core(struct mac_context *mac_ctx,
 		mac_hdr = WMA_GET_RX_MAC_HEADER(bd_ptr);
 		if (subtype == SIR_MAC_MGMT_ASSOC_REQ) {
 			pe_debug("ASSOC REQ frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", Assoc Req count so far: %d",
-				 MAC_ADDR_ARRAY(mac_hdr->da),
-				 MAC_ADDR_ARRAY(mac_hdr->sa),
-				 MAC_ADDR_ARRAY(mac_hdr->bssId),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->da),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->sa),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
 				 mac_ctx->sys.gSysFrameCount[type][subtype]);
 		}
 		if (subtype == SIR_MAC_MGMT_DEAUTH) {
 			pe_debug("DEAUTH frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DEAUTH count so far: %d",
-				 MAC_ADDR_ARRAY(mac_hdr->da),
-				 MAC_ADDR_ARRAY(mac_hdr->sa),
-				 MAC_ADDR_ARRAY(mac_hdr->bssId),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->da),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->sa),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
 				 mac_ctx->sys.gSysFrameCount[type][subtype]);
 		}
 		if (subtype == SIR_MAC_MGMT_DISASSOC) {
 			pe_debug("DISASSOC frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DISASSOC count so far: %d",
-				 MAC_ADDR_ARRAY(mac_hdr->da),
-				 MAC_ADDR_ARRAY(mac_hdr->sa),
-				 MAC_ADDR_ARRAY(mac_hdr->bssId),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->da),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->sa),
+				 QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
 				 mac_ctx->sys.gSysFrameCount[type][subtype]);
 		}
 
diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index f261f289c688..f60196bb4a7c 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -690,7 +690,7 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx,
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"),
-				  roam_result, MAC_ADDR_ARRAY(
+				  roam_result, QDF_MAC_ADDR_ARRAY(
 					csr_roam_info->peerMac.bytes));
 		*ret_status = QDF_STATUS_E_FAILURE;
 		}
@@ -698,7 +698,7 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx,
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 			  FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"),
 			  roam_result,
-			  MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes));
+			  QDF_MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes));
 		*ret_status = QDF_STATUS_E_FAILURE;
 	}
 	return;
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index cbcbd3cca940..a6798c5d5546 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -3335,7 +3335,7 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size)
 		macArray = (macList + i)->bytes;
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "** ACL entry %i - " MAC_ADDRESS_STR, i,
-			  MAC_ADDR_ARRAY(macArray));
+			  QDF_MAC_ADDR_ARRAY(macArray));
 	}
 	return;
 }
@@ -3354,7 +3354,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx,
 		    (sap_ctx->denyMacList, sap_ctx->nDenyMac, peerMac, NULL)) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Peer " MAC_ADDRESS_STR " in deny list",
-			  __func__, MAC_ADDR_ARRAY(peerMac));
+			  __func__, QDF_MAC_ADDR_ARRAY(peerMac));
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* A new station CAN associate, unless in deny list. Less stringent mode */
@@ -3366,7 +3366,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx,
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Peer " MAC_ADDRESS_STR
 			  " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED",
-			  __func__, MAC_ADDR_ARRAY(peerMac));
+			  __func__, QDF_MAC_ADDR_ARRAY(peerMac));
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -3379,7 +3379,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx,
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Peer " MAC_ADDRESS_STR
 			  " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
-			  __func__, MAC_ADDR_ARRAY(peerMac));
+			  __func__, QDF_MAC_ADDR_ARRAY(peerMac));
 		return QDF_STATUS_E_FAILURE;
 	}
 	return QDF_STATUS_SUCCESS;
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index 485942e6bdf0..44c892ea26f5 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -977,7 +977,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "requested peer mac is" MAC_ADDRESS_STR
 			  "our own SAP BSSID. Do not blacklist or whitelist this BSSID",
-			  MAC_ADDR_ARRAY(peer_sta_mac));
+			  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 		return QDF_STATUS_E_FAULT;
 	}
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
@@ -1007,7 +1007,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 			  "Peer mac " MAC_ADDRESS_STR
 			  " found in white and black lists."
 			  "Initial lists passed incorrect. Cannot execute this command.",
-			  MAC_ADDR_ARRAY(peer_sta_mac));
+			  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 		return QDF_STATUS_E_FAILURE;
 
 	}
@@ -1024,7 +1024,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					  QDF_TRACE_LEVEL_ERROR,
 					  "White list is already maxed out. Cannot accept "
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(peer_sta_mac));
+					  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_E_FAILURE;
 			}
 			if (sta_white_list) {
@@ -1033,7 +1033,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address already present in white list "
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(peer_sta_mac));
+					  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_SUCCESS;
 			}
 			if (sta_black_list) {
@@ -1083,7 +1083,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address to be deleted is not present in the white list "
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(peer_sta_mac));
+					  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_E_FAILURE;
 			}
 		} else {
@@ -1104,7 +1104,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					  QDF_TRACE_LEVEL_ERROR,
 					  "Black list is already maxed out. Cannot accept "
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(peer_sta_mac));
+					  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_E_FAILURE;
 			}
 			if (sta_black_list) {
@@ -1113,7 +1113,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address already present in black list "
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(peer_sta_mac));
+					  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_SUCCESS;
 			}
 			if (sta_white_list) {
@@ -1159,7 +1159,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address to be deleted is not present in the black list "
 					  MAC_ADDRESS_STR,
-					  MAC_ADDR_ARRAY(peer_sta_mac));
+					  QDF_MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_E_FAILURE;
 			}
 		} else {
@@ -2364,7 +2364,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
 		  FL("Delete STA with RC:%hu subtype:%hhu MAC::"
 		     MAC_ADDRESS_STR),
 		  params->reason_code, params->subtype,
-		  MAC_ADDR_ARRAY(params->peerMacAddr.bytes));
+		  QDF_MAC_ADDR_ARRAY(params->peerMacAddr.bytes));
 }
 
 QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 5d24c03f5f11..d03e40c35359 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -11641,7 +11641,7 @@ int sme_send_he_om_ctrl_update(mac_handle_t mac_handle, uint8_t session_id)
 		 omi_data.ul_mu_dis, omi_data.omi_in_vht, omi_data.omi_in_he);
 	qdf_mem_copy(&param_val, &omi_data, sizeof(omi_data));
 	sme_debug("param val %08X, bssid:"MAC_ADDRESS_STR, param_val,
-		  MAC_ADDR_ARRAY(session->connectedProfile.bssid.bytes));
+		  QDF_MAC_ADDR_ARRAY(session->connectedProfile.bssid.bytes));
 	status = wma_set_peer_param(wma_handle,
 				    session->connectedProfile.bssid.bytes,
 				    WMI_PEER_PARAM_XMIT_OMI,
@@ -14469,7 +14469,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
 	if ((bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_thres) &&
 	    (conn_bss_desc->rssi > mbo_cfg->mbo_current_rssi_thres)) {
 		sme_err("Candidate BSS "MAC_ADDRESS_STR" has LOW RSSI(%d), hence reject",
-			MAC_ADDR_ARRAY(bss_desc->bssId), bss_desc->rssi);
+			QDF_MAC_ADDR_ARRAY(bss_desc->bssId), bss_desc->rssi);
 		info->status = QCA_STATUS_REJECT_LOW_RSSI;
 		return true;
 	}
@@ -14487,7 +14487,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
 		if ((conn_bss_desc->rssi > current_rssi_mcc_thres) &&
 		    csr_is_mcc_channel(mac_ctx, bss_desc->channelId)) {
 			sme_err("Candidate BSS "MAC_ADDRESS_STR" causes MCC, hence reject",
-				MAC_ADDR_ARRAY(bss_desc->bssId));
+				QDF_MAC_ADDR_ARRAY(bss_desc->bssId));
 			info->status =
 				QCA_STATUS_REJECT_INSUFFICIENT_QOS_CAPACITY;
 			return true;
@@ -14505,7 +14505,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
 		    is_bt_in_progress &&
 		    (bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_btc_thres)) {
 			sme_err("Candidate BSS "MAC_ADDRESS_STR" causes BT coex, hence reject",
-				MAC_ADDR_ARRAY(bss_desc->bssId));
+				QDF_MAC_ADDR_ARRAY(bss_desc->bssId));
 			info->status =
 				QCA_STATUS_REJECT_EXCESSIVE_DELAY_EXPECTED;
 			return true;
@@ -14522,7 +14522,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
 		    bss_desc->channelId))) {
 			sme_err("High interference expected if transitioned to BSS "
 				MAC_ADDRESS_STR" hence reject",
-				MAC_ADDR_ARRAY(bss_desc->bssId));
+				QDF_MAC_ADDR_ARRAY(bss_desc->bssId));
 			info->status =
 				QCA_STATUS_REJECT_HIGH_INTERFERENCE;
 			return true;
@@ -14574,7 +14574,7 @@ QDF_STATUS sme_get_bss_transition_status(mac_handle_t mac_handle,
 						       res);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			sme_err("BSS "MAC_ADDRESS_STR" not present in scan list",
-				MAC_ADDR_ARRAY(info[i].bssid.bytes));
+				QDF_MAC_ADDR_ARRAY(info[i].bssid.bytes));
 			info[i].status = QCA_STATUS_REJECT_UNKNOWN;
 			continue;
 		}
@@ -14743,7 +14743,7 @@ QDF_STATUS sme_handle_sae_msg(mac_handle_t mac_handle,
 			sme_debug("SAE: sae_status %d session_id %d Peer: "
 				  MAC_ADDRESS_STR, sae_msg->sae_status,
 				  sae_msg->session_id,
-				  MAC_ADDR_ARRAY(sae_msg->peer_mac_addr));
+				  QDF_MAC_ADDR_ARRAY(sae_msg->peer_mac_addr));
 
 			sch_msg.type = eWNI_SME_SEND_SAE_MSG;
 			sch_msg.bodyptr = sae_msg;
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index e4f47e699bda..877fbfddbbde 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -276,7 +276,8 @@ QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t session_
 
 	qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac);
 	msg->smeSessionId = session_id;
-	sme_debug("BSSID = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(msg->bssid.bytes));
+	sme_debug("BSSID = " MAC_ADDRESS_STR,
+		  QDF_MAC_ADDR_ARRAY(msg->bssid.bytes));
 	status = umac_send_mb_message_to_mac(msg);
 
 	return status;
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 5cb994b41a39..923be4eb1825 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -173,7 +173,7 @@ static QDF_STATUS csr_sae_callback(struct mac_context *mac_ctx,
 
 	sme_debug("vdev_id %d "MAC_ADDRESS_STR"",
 		sae_info->vdev_id,
-		MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes));
+		QDF_MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes));
 
 	session_id = sae_info->vdev_id;
 	if (session_id == WLAN_UMAC_VDEV_ID_MAX)
@@ -1976,7 +1976,7 @@ static void csr_send_ese_adjacent_ap_rep_ind(struct mac_context *mac,
 	roamTS2 = qdf_mc_timer_get_system_time();
 	roam_info->tsmRoamDelay = roamTS2 - pSession->roamTS1;
 	sme_debug("Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)",
-		MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes),
+		QDF_MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes),
 		roam_info->tsmRoamDelay);
 
 	pe_session = pe_find_session_by_bssid(mac,
@@ -3644,7 +3644,7 @@ QDF_STATUS csr_roam_issue_disassociate(struct mac_context *mac, uint32_t session
 	}
 
 	sme_debug("CSR Attempting to Disassociate Bssid=" MAC_ADDRESS_STR
-		   " subState: %s reason: %d", MAC_ADDR_ARRAY(bssId.bytes),
+		   " subState: %s reason: %d", QDF_MAC_ADDR_ARRAY(bssId.bytes),
 		mac_trace_getcsr_roam_sub_state(NewSubstate), reasonCode);
 
 	csr_roam_substate_change(mac, NewSubstate, sessionId);
@@ -3770,7 +3770,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId,
 			     sizeof(struct qdf_mac_addr));
 	}
 	sme_debug("CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR,
-		  MAC_ADDR_ARRAY(bssId.bytes));
+		  QDF_MAC_ADDR_ARRAY(bssId.bytes));
 	csr_roam_substate_change(mac, NewSubstate, sessionId);
 
 	status =
@@ -3781,7 +3781,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId,
 	else {
 		sme_err("csr_send_mb_deauth_req_msg failed with status %d Session ID: %d"
 			MAC_ADDRESS_STR, status, sessionId,
-			MAC_ADDR_ARRAY(bssId.bytes));
+			QDF_MAC_ADDR_ARRAY(bssId.bytes));
 	}
 
 	return status;
@@ -7939,7 +7939,7 @@ static void csr_roam_print_candidate_aps(tScanResultHandle results)
 		bss_desc = GET_BASE_ADDR(entry,
 				struct tag_csrscan_result, Link);
 		sme_debug("BSSID" MAC_ADDRESS_STR "score is %d",
-			  MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId),
+			  QDF_MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId),
 			  bss_desc->bss_score);
 
 		entry = csr_ll_next(&bss_list->List, entry,
@@ -8799,7 +8799,7 @@ static QDF_STATUS csr_roam_issue_join(struct mac_context *mac, uint32_t sessionI
 	QDF_STATUS status;
 
 	sme_debug("Attempting to Join Bssid= " MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(pSirBssDesc->bssId));
+		QDF_MAC_ADDR_ARRAY(pSirBssDesc->bssId));
 
 	/* Set the roaming substate to 'join attempt'... */
 	csr_roam_substate_change(mac, eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId);
@@ -9499,7 +9499,7 @@ void csr_handle_disassoc_ho(struct mac_context *mac, uint32_t session_id)
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "LFR2DBG: preauthed bss_node->pBssDescription BSSID"\
 		  MAC_ADDRESS_STR",Ch:%d",
-		  MAC_ADDR_ARRAY(bss_node->pBssDescription->bssId),
+		  QDF_MAC_ADDR_ARRAY(bss_node->pBssDescription->bssId),
 		  (int)bss_node->pBssDescription->channelId);
 
 	status = policy_mgr_handle_conc_multiport(mac->psoc, session_id,
@@ -10878,7 +10878,7 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(struct mac_context *mac,
 		qdf_copy_macaddr(&pMsg->bssId, bssId);
 		sme_debug(
 			"CSR reset caps change for Bssid= " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(pMsg->bssId.bytes));
+			QDF_MAC_ADDR_ARRAY(pMsg->bssId.bytes));
 		status = umac_send_mb_message_to_mac(pMsg);
 	} else {
 		sme_err("Memory allocation failed");
@@ -11290,7 +11290,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 				&pDisassocInd->bssid, &sessionId);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sme_err("Session Id not found for BSSID "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes));
+			QDF_MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes));
 		qdf_mem_free(cmd);
 		return;
 	}
@@ -11302,7 +11302,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	}
 
 	sme_err("DISASSOCIATION from peer =" MAC_ADDRESS_STR "reason: %d status: %d session: %d",
-		MAC_ADDR_ARRAY(pDisassocInd->peer_macaddr.bytes),
+		QDF_MAC_ADDR_ARRAY(pDisassocInd->peer_macaddr.bytes),
 		pDisassocInd->reasonCode,
 		pDisassocInd->statusCode, sessionId);
 	/*
@@ -12135,7 +12135,7 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 			"CSR: setkey command failed(err=%d) PeerMac "
 			MAC_ADDRESS_STR,
 			pRsp->statusCode,
-			MAC_ADDR_ARRAY(pRsp->peer_macaddr.bytes));
+			QDF_MAC_ADDR_ARRAY(pRsp->peer_macaddr.bytes));
 	}
 	/* keeping roam_id = 0 as nobody is using roam_id for set_key */
 	csr_roam_call_callback(mac_ctx, sessionId, roam_info,
@@ -14767,7 +14767,7 @@ static void csr_update_sae_config(struct join_req *csr_join_req,
 
 	sme_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR,
 		csr_join_req->sae_pmk_cached,
-		MAC_ADDR_ARRAY(csr_join_req->bssDescription.bssId));
+		QDF_MAC_ADDR_ARRAY(csr_join_req->bssDescription.bssId));
 }
 #else
 static void csr_update_sae_config(struct join_req *csr_join_req,
@@ -15060,7 +15060,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 			     sizeof(tSirMacAddr));
 		sme_info("Connecting to ssid:%.*s bssid: "MAC_ADDRESS_STR" rssi: %d channel: %d country_code: %c%c",
 			 csr_join_req->ssId.length, csr_join_req->ssId.ssId,
-			 MAC_ADDR_ARRAY(pBssDescription->bssId),
+			 QDF_MAC_ADDR_ARRAY(pBssDescription->bssId),
 			 pBssDescription->rssi, pBssDescription->channelId,
 			 mac->scan.countryCodeCurrent[0],
 			 mac->scan.countryCodeCurrent[1]);
@@ -15933,9 +15933,9 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac,
 		pMsg->length = len;
 
 		qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
-		sme_debug(
-			"CSR Attempting to change BI for Bssid= "
-			   MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMsg->bssid.bytes));
+		sme_debug("CSR Attempting to change BI for Bssid= "
+			  MAC_ADDRESS_STR,
+			  QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes));
 		pMsg->sessionId = sessionId;
 		sme_debug("session %d BeaconInterval %d",
 			sessionId,
@@ -15977,7 +15977,8 @@ QDF_STATUS csr_set_ht2040_mode(struct mac_context *mac, uint32_t sessionId,
 		qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
 		sme_debug(
 			"CSR Attempting to set HT20/40 mode for Bssid= "
-			   MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMsg->bssid.bytes));
+			 MAC_ADDRESS_STR,
+			 QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes));
 		pMsg->sessionId = sessionId;
 		sme_debug("  session %d HT20/40 mode %d",
 			sessionId, cbMode);
@@ -16615,7 +16616,7 @@ QDF_STATUS csr_issue_add_sta_for_session_req(struct mac_context *mac,
 
 	sme_debug(
 		"Send WMA_ADD_STA_SELF_REQ for selfMac=" MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY(add_sta_self_req->self_mac_addr));
+		 QDF_MAC_ADDR_ARRAY(add_sta_self_req->self_mac_addr));
 	status = scheduler_post_message(QDF_MODULE_ID_SME,
 					QDF_MODULE_ID_WMA,
 					QDF_MODULE_ID_WMA, &msg);
@@ -16650,7 +16651,7 @@ QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx,
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		sme_err("Session %d exists with mac address " MAC_ADDRESS_STR,
 			existing_session_id,
-			MAC_ADDR_ARRAY(session_param->self_mac_addr));
+			QDF_MAC_ADDR_ARRAY(session_param->self_mac_addr));
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -17000,7 +17001,7 @@ static void csr_roam_link_up(struct mac_context *mac, struct qdf_mac_addr bssid)
 	 */
 
 	sme_debug("WLAN link UP with AP= " MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(bssid.bytes));
+		QDF_MAC_ADDR_ARRAY(bssid.bytes));
 	/* Indicate the neighbor roal algorithm about the connect indication */
 	csr_roam_get_session_id_from_bssid(mac, &bssid,
 					   &sessionId);
@@ -19369,7 +19370,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id,
 	for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"Blacklist Bssid:"MAC_ADDRESS_STR")",
-			MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].
+			QDF_MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].
 				bytes));
 	}
 	for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) {
@@ -19381,7 +19382,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id,
 	for (i = 0; i < roam_params_dst->num_bssid_favored; i++) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"Preferred Bssid:"MAC_ADDRESS_STR") score: %d",
-			MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes),
+			QDF_MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes),
 			roam_params_dst->bssid_favored_factor[i]);
 	}
 
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 23f46213fed0..fc6feac2ee18 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -481,7 +481,7 @@ static bool csr_scan_save_bss_description(struct mac_context *mac,
 	sme_debug(
 		"Set Aging Count = %d for BSS " MAC_ADDRESS_STR " ",
 		pCsrBssDescription->AgingCount,
-		MAC_ADDR_ARRAY(pCsrBssDescription->Result.BssDescriptor.
+		QDF_MAC_ADDR_ARRAY(pCsrBssDescription->Result.BssDescriptor.
 			       bssId));
 	qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor,
 		     pBSSDescription, cbBSSDesc);
@@ -1789,9 +1789,9 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
 		return QDF_STATUS_E_FAILURE;
 	}
 	sme_debug("Current bssid::"MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId));
+		QDF_MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId));
 	sme_debug("My bssid::"MAC_ADDRESS_STR" channel %d",
-		MAC_ADDR_ARRAY(bssid.bytes), channel);
+		QDF_MAC_ADDR_ARRAY(bssid.bytes), channel);
 
 	size = pSession->pConnectBssDesc->length +
 		sizeof(pSession->pConnectBssDesc->length);
@@ -1856,7 +1856,7 @@ csr_rso_save_ap_to_scan_cache(struct mac_context *mac,
 			(sizeof(tSirBssDescription) + length));
 
 	sme_debug("LFR3:Add BSSID to scan cache" MAC_ADDRESS_STR,
-		MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId));
+		QDF_MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId));
 	csr_scan_add_result(mac, scan_res_ptr);
 	csr_free_scan_result_entry(mac, scan_res_ptr);
 	return QDF_STATUS_SUCCESS;
diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c
index 3dace13129f3..86145bb17cdd 100644
--- a/core/sme/src/csr/csr_host_scan_roam.c
+++ b/core/sme/src/csr/csr_host_scan_roam.c
@@ -203,7 +203,7 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  FL("Scan result: BSSID " MAC_ADDRESS_STR
 				     " (Rssi %d, Ch:%d)"),
-				  MAC_ADDR_ARRAY(descr->bssId),
+				  QDF_MAC_ADDR_ARRAY(descr->bssId),
 				  (int)abs(descr->rssi), descr->channelId);
 
 			if (!qdf_mem_cmp(descr->bssId,
@@ -283,14 +283,14 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 				QDF_TRACE(QDF_MODULE_ID_SME,
 					QDF_TRACE_LEVEL_DEBUG,
 					"BSSID:" MAC_ADDRESS_STR "has no BW",
-					MAC_ADDR_ARRAY(descr->bssId));
+					QDF_MAC_ADDR_ARRAY(descr->bssId));
 				continue;
 			}
 			if (voadmitted && !qpresent) {
 				QDF_TRACE(QDF_MODULE_ID_SME,
 					QDF_TRACE_LEVEL_DEBUG,
 					"BSSID:" MAC_ADDRESS_STR "no LOAD IE",
-					MAC_ADDR_ARRAY(descr->bssId));
+					QDF_MAC_ADDR_ARRAY(descr->bssId));
 				continue;
 			}
 #endif /* FEATURE_WLAN_ESE */
@@ -632,7 +632,7 @@ void csr_neighbor_roam_request_handoff(struct mac_context *mac_ctx,
 	}
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR),
-		  MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId));
+		  QDF_MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId));
 
 	roam_info = qdf_mem_malloc(sizeof(*roam_info));
 	if (!roam_info)
diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c
index 935456197729..c1776846822d 100644
--- a/core/sme/src/csr/csr_neighbor_roam.c
+++ b/core/sme/src/csr/csr_neighbor_roam.c
@@ -818,7 +818,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(struct mac_context *mac,
 			FL("Disconn ind on session %d in state %d from bss :"
 			MAC_ADDRESS_STR), sessionId,
 			pNeighborRoamInfo->neighborRoamState,
-			MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes));
+			QDF_MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes));
 	/*
 	 * Free the current previous profile and move
 	 * the current profile to prev profile.
diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c
index 0b23946ec1b7..5a4606e8b98b 100644
--- a/core/sme/src/csr/csr_roam_preauth.c
+++ b/core/sme/src/csr/csr_roam_preauth.c
@@ -242,7 +242,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(struct mac_context *mac_ctx,
 		sme_debug("Preauth completed successfully after %d tries",
 			neighbor_roam_info->FTRoamInfo.numPreAuthRetries);
 		sme_debug("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d",
-			MAC_ADDR_ARRAY(
+			QDF_MAC_ADDR_ARRAY(
 				preauth_rsp_node->pBssDescription->bssId),
 			(int)preauth_rsp_node->pBssDescription->channelId);
 
@@ -375,7 +375,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx
 				numMACAddress;
 
 	sme_warn("Added BSSID " MAC_ADDRESS_STR " to Preauth failed list",
-		MAC_ADDR_ARRAY(bssid));
+		QDF_MAC_ADDR_ARRAY(bssid));
 
 	for (i = 0;
 	     i < neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress;
@@ -384,7 +384,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx
 		   neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i],
 		   bssid, sizeof(tSirMacAddr))) {
 			sme_warn("BSSID "MAC_ADDRESS_STR" already fail list",
-			MAC_ADDR_ARRAY(bssid));
+			QDF_MAC_ADDR_ARRAY(bssid));
 			return QDF_STATUS_SUCCESS;
 		}
 	}
@@ -430,7 +430,7 @@ bool csr_neighbor_roam_is_preauth_candidate(struct mac_context *mac,
 				    preAuthFailList.macAddress[i], bssId,
 				    sizeof(tSirMacAddr))) {
 			sme_err("BSSID exists in fail list" MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(bssId));
+					QDF_MAC_ADDR_ARRAY(bssId));
 			return false;
 		}
 	}
@@ -762,7 +762,7 @@ QDF_STATUS csr_neighbor_roam_issue_preauth_req(struct mac_context *mac_ctx,
 				eCsrPerformPreauth, true);
 
 	sme_debug("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d",
-			MAC_ADDR_ARRAY(
+			QDF_MAC_ADDR_ARRAY(
 				neighbor_bss_node->pBssDescription->bssId),
 			(int)neighbor_bss_node->pBssDescription->channelId);
 
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index d36d07405d6f..2ddcec2f0aa9 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -3694,8 +3694,8 @@ bool csr_lookup_pmkid_using_bssid(struct mac_context *mac,
 	for (i = 0; i < session->NumPmkidCache; i++) {
 		session_pmk = &session->PmkidCacheInfo[i];
 		sme_debug("Matching BSSID: " MAC_ADDRESS_STR " to cached BSSID:"
-			MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pmk_cache->BSSID.bytes),
-			MAC_ADDR_ARRAY(session_pmk->BSSID.bytes));
+			MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pmk_cache->BSSID.bytes),
+			QDF_MAC_ADDR_ARRAY(session_pmk->BSSID.bytes));
 		if (qdf_is_macaddr_equal(&pmk_cache->BSSID,
 					 &session_pmk->BSSID)) {
 			/* match found */
@@ -4275,7 +4275,7 @@ static bool csr_lookup_bkid(struct mac_context *mac, uint32_t sessionId,
 	do {
 		for (Index = 0; Index < pSession->NumBkidCache; Index++) {
 			sme_debug("match BKID " MAC_ADDRESS_STR " to ",
-				MAC_ADDR_ARRAY(pBSSId));
+				QDF_MAC_ADDR_ARRAY(pBSSId));
 			if (!qdf_mem_cmp
 			    (pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes,
 				    sizeof(struct qdf_mac_addr))) {
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index b4e24fec0a88..1d03c61a6df2 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/core/sme/src/rrm/sme_rrm.c
@@ -211,7 +211,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx,
 				beacon_rep->pBssDescription[i];
 			sme_debug("RRM Result Bssid = " MAC_ADDRESS_STR
 				" chan= %d, rssi = -%d",
-				MAC_ADDR_ARRAY(
+				QDF_MAC_ADDR_ARRAY(
 				beacon_rep->pBssDescription[i]->bssId),
 				beacon_rep->pBssDescription[i]->channelId,
 				beacon_rep->pBssDescription[i]->rssi * (-1));
@@ -358,7 +358,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results(
 			bcn_report->bcnRepBssInfo[j].ieLen = out_ie_len;
 
 			sme_debug("Bssid"MAC_ADDRESS_STR" Channel: %d Rssi: %d",
-				MAC_ADDR_ARRAY(bss_desc->bssId),
+				QDF_MAC_ADDR_ARRAY(bss_desc->bssId),
 				bss_desc->channelId, (-1) * bss_desc->rssi);
 			bcn_report->numBss++;
 			if (++j >= SIR_BCN_REPORT_MAX_BSS_DESC)
@@ -766,7 +766,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
 			&sme_rrm_ctx->sessionBssId, &session_id);
 	if (status != QDF_STATUS_SUCCESS) {
 		sme_err("sme session ID not found for bssid= "MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(sme_rrm_ctx->sessionBssId.bytes));
+			QDF_MAC_ADDR_ARRAY(sme_rrm_ctx->sessionBssId.bytes));
 		status = QDF_STATUS_E_FAILURE;
 		goto free_ch_lst;
 	}
@@ -1340,7 +1340,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac,
 
 		sme_debug("Received neighbor report with Neighbor BSSID: "
 			MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(
+			QDF_MAC_ADDR_ARRAY(
 			       neighbor_rpt->sNeighborBssDescription[i].bssId));
 
 		rrm_calculate_neighbor_ap_roam_score(mac, neighbor_rpt_desc);
@@ -1351,7 +1351,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac,
 		} else {
 			sme_err("Roam score of BSSID  " MAC_ADDRESS_STR
 				" is 0, Ignoring..",
-				MAC_ADDR_ARRAY(neighbor_rpt->
+				QDF_MAC_ADDR_ARRAY(neighbor_rpt->
 					       sNeighborBssDescription[i].
 					       bssId));
 
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index 3eff35f3a7c0..23fcf2ca8991 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -2203,7 +2203,7 @@ int wma_ibss_peer_info_event_handler(void *handle, uint8_t *data,
 		pSmeRsp->txRate = peer_info->data_rate;
 
 		WMA_LOGE("peer " MAC_ADDRESS_STR "rssi %d txRate %d",
-			MAC_ADDR_ARRAY(peer_mac),
+			QDF_MAC_ADDR_ARRAY(peer_mac),
 			pSmeRsp->rssi, pSmeRsp->txRate);
 
 		peer_info++;
@@ -3311,10 +3311,10 @@ uint8_t wma_rx_invalid_peer_ind(uint8_t vdev_id, void *wh)
 	WMA_LOGD("%s: vdev_id %d", __func__, vdev_id);
 	WMA_LOGD("%s: RA:" MAC_ADDRESS_STR,
 		 __func__,
-		 MAC_ADDR_ARRAY(rx_inv_msg->ra));
+		 QDF_MAC_ADDR_ARRAY(rx_inv_msg->ra));
 	WMA_LOGD("%s: TA:" MAC_ADDRESS_STR,
 		 __func__,
-		 MAC_ADDR_ARRAY(rx_inv_msg->ta));
+		 QDF_MAC_ADDR_ARRAY(rx_inv_msg->ta));
 
 	wma_send_msg(wma, SIR_LIM_RX_INVALID_PEER, (void *)rx_inv_msg, 0);
 
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 3380f87fc2c7..e422534a7e4d 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -4483,8 +4483,8 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss)
 
 	vdev = wma_find_vdev_by_addr(wma, add_bss->bssId, &vdev_id);
 	if (!vdev) {
-		WMA_LOGE("%s: Failed to get vdev handle:"MAC_ADDRESS_STR,
-			__func__, MAC_ADDR_ARRAY(add_bss->bssId));
+		wma_err("Failed to get vdev handle:"MAC_ADDRESS_STR,
+			QDF_MAC_ADDR_ARRAY(add_bss->bssId));
 
 		goto send_fail_resp;
 	}
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 725ca1d59990..3aa02cab65e2 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -597,11 +597,11 @@ QDF_STATUS wma_process_dhcp_ind(WMA_HANDLE handle,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	WMA_LOGD("%s: WMA --> WMI_PEER_SET_PARAM triggered by DHCP, msgType=%s, device_mode=%d, macAddr=" MAC_ADDRESS_STR,
-		__func__, ta_dhcp_ind->msgType == WMA_DHCP_START_IND ?
+	wma_debug("WMA --> WMI_PEER_SET_PARAM triggered by DHCP, msgType=%s, device_mode=%d, macAddr=" MAC_ADDRESS_STR,
+		ta_dhcp_ind->msgType == WMA_DHCP_START_IND ?
 		"WMA_DHCP_START_IND" : "WMA_DHCP_STOP_IND",
 		ta_dhcp_ind->device_mode,
-		MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr.bytes));
+		QDF_MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr.bytes));
 
 	/* fill in values */
 	peer_set_param_fp.vdev_id = vdev_id;
@@ -2323,8 +2323,8 @@ static void wma_wow_parse_data_pkt(t_wma_handle *wma,
 
 	src_mac = data + QDF_NBUF_SRC_MAC_OFFSET;
 	dest_mac = data + QDF_NBUF_DEST_MAC_OFFSET;
-	WMA_LOGI("Src_mac: " MAC_ADDRESS_STR ", Dst_mac: " MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY(src_mac), MAC_ADDR_ARRAY(dest_mac));
+	wma_info("Src_mac: " MAC_ADDRESS_STR ", Dst_mac: " MAC_ADDRESS_STR,
+		 QDF_MAC_ADDR_ARRAY(src_mac), QDF_MAC_ADDR_ARRAY(dest_mac));
 
 	wma_wow_inc_wake_lock_stats_by_dst_addr(wma, vdev_id, dest_mac);
 
@@ -2414,9 +2414,9 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer,
 		uint8_t to_from_ds, frag_num;
 		uint32_t seq_num;
 
-		WMA_LOGE("RA: " MAC_ADDRESS_STR " TA: " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(wh->i_addr1),
-			MAC_ADDR_ARRAY(wh->i_addr2));
+		wma_err("RA: " MAC_ADDRESS_STR " TA: " MAC_ADDRESS_STR,
+			QDF_MAC_ADDR_ARRAY(wh->i_addr1),
+			QDF_MAC_ADDR_ARRAY(wh->i_addr2));
 
 		WMA_LOGE("TO_DS: %u, FROM_DS: %u",
 			wh->i_fc[1] & IEEE80211_FC1_DIR_TODS,
@@ -2426,23 +2426,23 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer,
 
 		switch (to_from_ds) {
 		case IEEE80211_FC1_DIR_NODS:
-			WMA_LOGE("BSSID: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(wh->i_addr3));
+			wma_err("BSSID: " MAC_ADDRESS_STR,
+				QDF_MAC_ADDR_ARRAY(wh->i_addr3));
 			break;
 		case IEEE80211_FC1_DIR_TODS:
-			WMA_LOGE("DA: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(wh->i_addr3));
+			wma_err("DA: " MAC_ADDRESS_STR,
+				QDF_MAC_ADDR_ARRAY(wh->i_addr3));
 			break;
 		case IEEE80211_FC1_DIR_FROMDS:
-			WMA_LOGE("SA: " MAC_ADDRESS_STR,
-				MAC_ADDR_ARRAY(wh->i_addr3));
+			wma_err("SA: " MAC_ADDRESS_STR,
+				QDF_MAC_ADDR_ARRAY(wh->i_addr3));
 			break;
 		case IEEE80211_FC1_DIR_DSTODS:
 			if (buf_len >= sizeof(struct ieee80211_frame_addr4))
-				WMA_LOGE("DA: " MAC_ADDRESS_STR " SA: "
+				wma_err("DA: " MAC_ADDRESS_STR " SA: "
 					MAC_ADDRESS_STR,
-					MAC_ADDR_ARRAY(wh->i_addr3),
-					MAC_ADDR_ARRAY(wh->i_addr4));
+					QDF_MAC_ADDR_ARRAY(wh->i_addr3),
+					QDF_MAC_ADDR_ARRAY(wh->i_addr4));
 			break;
 		}
 
@@ -4079,9 +4079,9 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle,
 		restore_last_peer = cdp_peer_is_vdev_restore_last_peer(
 						soc, peer);
 
-		WMA_LOGD("%s: calling wma_remove_peer for peer " MAC_ADDRESS_STR
-			 " vdevId: %d", __func__,
-			 MAC_ADDR_ARRAY(peer_mac_addr),
+		wma_debug("calling wma_remove_peer for peer " MAC_ADDRESS_STR
+			 " vdevId: %d",
+			 QDF_MAC_ADDR_ARRAY(peer_mac_addr),
 			 peer_state->vdev_id);
 		qdf_status = wma_remove_peer(wma_handle, peer_mac_addr,
 					     peer_state->vdev_id, peer, false);
@@ -5472,7 +5472,7 @@ int wma_pdev_div_info_evt_handler(void *handle, u_int8_t *event_buf,
 	qdf_mem_zero(&chain_rssi_result, sizeof(chain_rssi_result));
 
 	WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->macaddr, macaddr);
-	WMA_LOGD(FL("macaddr: " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(macaddr));
+	wma_debug("macaddr: " MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macaddr));
 
 	WMA_LOGD(FL("num_chains_valid: %d"), event->num_chains_valid);
 	chain_rssi_result.num_chains_valid = event->num_chains_valid;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index e9d8539813c6..527bac1fee89 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -641,8 +641,8 @@ static void wma_process_send_addba_req(tp_wma_handle wma_handle,
 	if (QDF_STATUS_SUCCESS != status) {
 		WMA_LOGE(FL("Failed to process WMA_SEND_ADDBA_REQ"));
 	}
-	WMA_LOGD(FL("sent ADDBA req to" MAC_ADDRESS_STR "tid %d buff_size %d"),
-			MAC_ADDR_ARRAY(send_addba->mac_addr),
+	wma_debug("sent ADDBA req to" MAC_ADDRESS_STR "tid %d buff_size %d",
+			QDF_MAC_ADDR_ARRAY(send_addba->mac_addr),
 			send_addba->param.tidno,
 			send_addba->param.buffersize);
 
@@ -3838,8 +3838,8 @@ static int wma_set_base_macaddr_indicate(tp_wma_handle wma_handle,
 				     (uint8_t *)customAddr);
 	if (err)
 		return -EIO;
-	WMA_LOGD("Base MAC Addr: " MAC_ADDRESS_STR,
-		 MAC_ADDR_ARRAY((*customAddr)));
+	wma_debug("Base MAC Addr: " MAC_ADDRESS_STR,
+		 QDF_MAC_ADDR_ARRAY((*customAddr)));
 
 	return 0;
 }
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 5d5f31877850..1ad71f99e19f 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -3992,8 +3992,9 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle,
 		rx_pkt->pkt_meta.mpdu_data_ptr =
 		rx_pkt->pkt_meta.mpdu_hdr_ptr +
 		rx_pkt->pkt_meta.mpdu_hdr_len;
-		WMA_LOGD(FL("BSSID: "MAC_ADDRESS_STR" tsf_delta: %u"),
-		    MAC_ADDR_ARRAY(wh->i_addr3), rx_pkt->pkt_meta.tsf_delta);
+		wma_debug("BSSID: "MAC_ADDRESS_STR" tsf_delta: %u",
+			  QDF_MAC_ADDR_ARRAY(wh->i_addr3),
+			  rx_pkt->pkt_meta.tsf_delta);
 	} else {
 		if (QDF_IS_ADDR_BROADCAST(wh->i_addr1) ||
 		    IEEE80211_IS_MULTICAST(wh->i_addr1)) {
@@ -4176,9 +4177,9 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 	 * If the mpdu_data_len is greater than Max (2k), drop the frame
 	 */
 	if (rx_pkt->pkt_meta.mpdu_data_len > WMA_MAX_MGMT_MPDU_LEN) {
-		WMA_LOGE("Data Len %d greater than max, dropping frame from "MAC_ADDRESS_STR,
+		wma_err("Data Len %d greater than max, dropping frame from "MAC_ADDRESS_STR,
 			 rx_pkt->pkt_meta.mpdu_data_len,
-			 MAC_ADDR_ARRAY(wh->i_addr3));
+			 QDF_MAC_ADDR_ARRAY(wh->i_addr3));
 		qdf_nbuf_free(buf);
 		qdf_mem_free(rx_pkt);
 		return -EINVAL;
@@ -4225,8 +4226,8 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 		if (mgmt_rx_params->buf_len <=
 			(sizeof(struct ieee80211_frame) +
 			offsetof(struct wlan_bcn_frame, ie))) {
-			WMA_LOGD("Dropping frame from "MAC_ADDRESS_STR,
-				 MAC_ADDR_ARRAY(wh->i_addr3));
+			wma_debug("Dropping frame from "MAC_ADDRESS_STR,
+				 QDF_MAC_ADDR_ARRAY(wh->i_addr3));
 			cds_pkt_return_packet(rx_pkt);
 			return -EINVAL;
 		}
diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c
index aa29714f5422..b7a5275f7c4c 100644
--- a/core/wma/src/wma_nan_datapath.c
+++ b/core/wma/src/wma_nan_datapath.c
@@ -161,8 +161,8 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 	}
 
 	iface = &wma->interfaces[cdp_get_vdev_id(soc, vdev)];
-	WMA_LOGD(FL("vdev: %d, peer_mac_addr: "MAC_ADDRESS_STR),
-		add_sta->smesessionId, MAC_ADDR_ARRAY(add_sta->staMac));
+	wma_debug("vdev: %d, peer_mac_addr: "MAC_ADDRESS_STR,
+		add_sta->smesessionId, QDF_MAC_ADDR_ARRAY(add_sta->staMac));
 
 	peer = cdp_peer_find_by_addr_and_vdev(soc,
 			pdev, vdev,