qcacmn: Replace QDF_MAC_ADDRESS_STR

QDF_MAC_ADDRESS_STR has been depreciated in favor of
QDF_MAC_ADDR_STR. Replace all usages with the new macro.

Change-Id: I534923783a32288f7861caf9ae52ca3aac965809
CRs-Fixed: 2179126

os_if/linux/tdls/src/wlan_cfg80211_tdls.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -44,7 +44,7 @@ static int wlan_cfg80211_tdls_validate_mac_addr(const uint8_t *mac)
 	static const uint8_t temp_mac[QDF_MAC_ADDR_SIZE] = {0};
 
 	if (!qdf_mem_cmp(mac, temp_mac, QDF_MAC_ADDR_SIZE)) {
-		cfg80211_debug("Invalid Mac address " QDF_MAC_ADDRESS_STR " cmd declined.",
+		cfg80211_debug("Invalid Mac address " QDF_MAC_ADDR_STR " cmd declined.",
 		QDF_MAC_ADDR_ARRAY(mac));
 		return -EINVAL;
 	}
@@ -173,7 +173,7 @@ int wlan_cfg80211_tdls_add_peer(struct wlan_objmgr_pdev *pdev,
 	if (status)
 		return status;
 
-	cfg80211_debug("Add TDLS peer " QDF_MAC_ADDRESS_STR,
+	cfg80211_debug("Add TDLS peer " QDF_MAC_ADDR_STR,
 		       QDF_MAC_ADDR_ARRAY(mac));
 	vdev = wlan_objmgr_get_vdev_by_macaddr_from_pdev(pdev, dev->dev_addr,
 							 WLAN_OSIF_ID);
@@ -388,7 +388,7 @@ int wlan_cfg80211_tdls_update_peer(struct wlan_objmgr_pdev *pdev,
 	if (status)
 		return status;
 
-	cfg80211_debug("Update TDLS peer " QDF_MAC_ADDRESS_STR,
+	cfg80211_debug("Update TDLS peer " QDF_MAC_ADDR_STR,
 		       QDF_MAC_ADDR_ARRAY(mac));
 	vdev = wlan_objmgr_get_vdev_by_macaddr_from_pdev(pdev, dev->dev_addr,
 							 WLAN_OSIF_ID);
@@ -727,7 +727,7 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_pdev *pdev,
 
 	/* make sure doesn't call send_mgmt() while it is pending */
 	if (TDLS_VDEV_MAGIC == tdls_priv->mgmt_tx_completion_status) {
-		cfg80211_err(QDF_MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY",
+		cfg80211_err(QDF_MAC_ADDR_STR " action %d couldn't sent, as one is pending. return EBUSY",
 			     QDF_MAC_ADDR_ARRAY(peer_mac), action_code);
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_OSIF_ID);
 		return -EBUSY;

qdf/linux/src/qdf_trace.c

@@ -1691,9 +1691,8 @@ void qdf_dp_display_proto_pkt(struct qdf_dp_trace_record_s *record,
 	struct qdf_dp_trace_proto_buf *buf =
 		(struct qdf_dp_trace_proto_buf *)record->data;
 
-	DPTRACE_PRINT("DPT: %04d: %s [%d] [%s%s] SA: "
-		QDF_MAC_ADDRESS_STR " %s DA: "
-		QDF_MAC_ADDRESS_STR,
+	DPTRACE_PRINT("DPT: %04d: %s [%d] [%s%s] SA: " QDF_MAC_ADDR_STR
+		" %s DA: " QDF_MAC_ADDR_STR,
 		index,
 		(live == true) ? "" : record->time,
 		buf->vdev_id,

umac/nan/core/src/nan_main.c

@@ -272,7 +272,7 @@ static QDF_STATUS nan_handle_confirm(
 		 * This peer was created at ndp_indication but
 		 * confirm failed, so it needs to be deleted
 		 */
-		nan_err("NDP confirm with reject and no active ndp sessions. deleting peer: "QDF_MAC_ADDRESS_STR" on vdev_id: %d",
+		nan_err("NDP confirm with reject and no active ndp sessions. deleting peer: "QDF_MAC_ADDR_STR" on vdev_id: %d",
 			QDF_MAC_ADDR_ARRAY(confirm->peer_ndi_mac_addr.bytes),
 			vdev_id);
 		psoc_nan_obj->cb_obj.delete_peers_by_addr(vdev_id,
@@ -332,7 +332,7 @@ static QDF_STATUS nan_handle_ndp_ind(
 	}
 
 	nan_debug("role: %d, vdev: %d, csid: %d, peer_mac_addr "
-		QDF_MAC_ADDRESS_STR,
+		QDF_MAC_ADDR_STR,
 		ndp_ind->role, vdev_id, ndp_ind->ncs_sk_type,
 		QDF_MAC_ADDR_ARRAY(ndp_ind->peer_mac_addr.bytes));
 

umac/p2p/core/src/wlan_p2p_off_chan_tx.c

@@ -702,9 +702,9 @@ static QDF_STATUS p2p_tx_update_connection_status(
 
 	if (tx_frame_info->public_action_type !=
 		P2P_PUBLIC_ACTION_NOT_SUPPORT)
-		p2p_debug("%s ---> OTA to "QDF_MAC_ADDRESS_STR,
-				p2p_get_frame_type_str(tx_frame_info),
-				QDF_MAC_ADDR_ARRAY(mac_to));
+		p2p_debug("%s ---> OTA to " QDF_MAC_ADDR_STR,
+			  p2p_get_frame_type_str(tx_frame_info),
+			  QDF_MAC_ADDR_ARRAY(mac_to));
 
 	if ((tx_frame_info->public_action_type ==
 	     P2P_PUBLIC_ACTION_PROV_DIS_REQ) &&
@@ -746,9 +746,9 @@ static QDF_STATUS p2p_rx_update_connection_status(
 
 	if (rx_frame_info->public_action_type !=
 		P2P_PUBLIC_ACTION_NOT_SUPPORT)
-		p2p_debug("%s <--- OTA from "QDF_MAC_ADDRESS_STR,
-				p2p_get_frame_type_str(rx_frame_info),
-				QDF_MAC_ADDR_ARRAY(mac_from));
+		p2p_debug("%s <--- OTA from " QDF_MAC_ADDR_STR,
+			  p2p_get_frame_type_str(rx_frame_info),
+			  QDF_MAC_ADDR_ARRAY(mac_from));
 
 	if ((rx_frame_info->public_action_type ==
 	     P2P_PUBLIC_ACTION_PROV_DIS_REQ) &&

umac/tdls/core/src/wlan_tdls_cmds_process.c

@@ -163,7 +163,7 @@ static QDF_STATUS tdls_pe_add_peer(struct tdls_add_peer_request *req)
 	qdf_mem_copy(addstareq->peermac.bytes, req->add_peer_req.peer_addr,
 		     QDF_MAC_ADDR_SIZE);
 
-	tdls_debug("for " QDF_MAC_ADDRESS_STR,
+	tdls_debug("for " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(addstareq->peermac.bytes));
 	msg.type = soc_obj->tdls_add_sta_req;
 	msg.bodyptr = addstareq;
@@ -228,7 +228,7 @@ QDF_STATUS tdls_pe_del_peer(struct tdls_del_peer_request *req)
 	qdf_mem_copy(delstareq->peermac.bytes, req->del_peer_req.peer_addr,
 		     QDF_MAC_ADDR_SIZE);
 
-	tdls_debug("for " QDF_MAC_ADDRESS_STR,
+	tdls_debug("for " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(delstareq->peermac.bytes));
 	msg.type = soc_obj->tdls_del_sta_req;
 	msg.bodyptr = delstareq;
@@ -313,7 +313,7 @@ static QDF_STATUS tdls_pe_update_peer(struct tdls_update_peer_request *req)
 	qdf_mem_copy(&addstareq->supported_rates,
 		     update_peer->supported_rates,
 		     update_peer->supported_rates_len);
-	tdls_debug("for " QDF_MAC_ADDRESS_STR,
+	tdls_debug("for " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(addstareq->peermac.bytes));
 
 	msg.type = soc_obj->tdls_add_sta_req;
@@ -452,7 +452,7 @@ static QDF_STATUS tdls_activate_add_peer(struct tdls_add_peer_request *req)
 
 	peer = tdls_get_peer(vdev_obj, mac);
 	if (!peer) {
-		tdls_err("peer: " QDF_MAC_ADDRESS_STR " not exist. invalid",
+		tdls_err("peer: " QDF_MAC_ADDR_STR " not exist. invalid",
 			 QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_INVAL;
 		goto addrsp;
@@ -469,7 +469,7 @@ static QDF_STATUS tdls_activate_add_peer(struct tdls_add_peer_request *req)
 
 	/* when others are on-going, we want to change link_status to idle */
 	if (tdls_is_progress(vdev_obj, mac, true)) {
-		tdls_notice(QDF_MAC_ADDRESS_STR " TDLS setuping. Req declined.",
+		tdls_notice(QDF_MAC_ADDR_STR " TDLS setuping. Req declined.",
 			    QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_PERM;
 		goto setlink;
@@ -478,7 +478,7 @@ static QDF_STATUS tdls_activate_add_peer(struct tdls_add_peer_request *req)
 	/* first to check if we reached to maximum supported TDLS peer. */
 	curr_tdls_peers = tdls_get_connected_peer(soc_obj);
 	if (soc_obj->max_num_tdls_sta <= curr_tdls_peers) {
-		tdls_err(QDF_MAC_ADDRESS_STR
+		tdls_err(QDF_MAC_ADDR_STR
 			 " Request declined. Current %d, Max allowed %d.",
 			 QDF_MAC_ADDR_ARRAY(mac), curr_tdls_peers,
 			 soc_obj->max_num_tdls_sta);
@@ -629,7 +629,7 @@ static int tdls_validate_setup_frames(struct tdls_soc_priv_obj *tdls_soc,
 	 * there is no harm to double-check.
 	 */
 	if (TDLS_SETUP_REQUEST == tdls_validate->action_code) {
-		tdls_err(QDF_MAC_ADDRESS_STR " TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).",
+		tdls_err(QDF_MAC_ADDR_STR " TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).",
 			 QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac),
 			 tdls_validate->action_code,
 			 tdls_soc->connected_peer_count,
@@ -641,7 +641,7 @@ static int tdls_validate_setup_frames(struct tdls_soc_priv_obj *tdls_soc,
 	 * code to supplicant
 	 */
 	tdls_validate->status_code = QDF_STATUS_E_RESOURCES;
-	tdls_err(QDF_MAC_ADDRESS_STR " TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).",
+	tdls_err(QDF_MAC_ADDR_STR " TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).",
 		 QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac),
 		 tdls_validate->action_code,
 		 tdls_soc->connected_peer_count,
@@ -690,7 +690,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 		/* if tdls_mode is disabled, then decline the peer's request */
 		if (TDLS_SUPPORT_DISABLED == tdls_soc->tdls_current_mode ||
 		    TDLS_SUPPORT_SUSPENDED == tdls_soc->tdls_current_mode) {
-			tdls_notice(QDF_MAC_ADDRESS_STR
+			tdls_notice(QDF_MAC_ADDR_STR
 				" TDLS mode is disabled. action %d declined.",
 				QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac),
 				tdls_validate->action_code);
@@ -698,7 +698,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 		}
 		if (tdls_soc->tdls_nss_switch_in_progress) {
 			tdls_err("nss switch in progress, action %d declined "
-				QDF_MAC_ADDRESS_STR,
+				QDF_MAC_ADDR_STR,
 				tdls_validate->action_code,
 				QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac));
 			return -EAGAIN;
@@ -709,7 +709,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 		if (NULL != tdls_is_progress(tdls_vdev,
 			tdls_validate->peer_mac, true)) {
 			tdls_err("setup is ongoing. action %d declined for "
-				 QDF_MAC_ADDRESS_STR,
+				 QDF_MAC_ADDR_STR,
 				 tdls_validate->action_code,
 				 QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac));
 			return -EPERM;
@@ -742,7 +742,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 					       tdls_validate->peer_mac);
 			if (curr_peer) {
 				if (TDLS_IS_LINK_CONNECTED(curr_peer)) {
-					tdls_err(QDF_MAC_ADDRESS_STR " already connected action %d declined.",
+					tdls_err(QDF_MAC_ADDR_STR " already connected action %d declined.",
 						QDF_MAC_ADDR_ARRAY(
 						tdls_validate->peer_mac),
 						tdls_validate->action_code);
@@ -753,7 +753,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 		}
 	}
 
-	tdls_notice("tdls_mgmt" QDF_MAC_ADDRESS_STR " action %d, dialog_token %d status %d, len = %zu",
+	tdls_notice("tdls_mgmt" QDF_MAC_ADDR_STR " action %d, dialog_token %d status %d, len = %zu",
 		   QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac),
 		   tdls_validate->action_code, tdls_validate->dialog_token,
 		   tdls_validate->status_code, tdls_validate->len);
@@ -763,7 +763,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 	if (TDLS_TEARDOWN == tdls_validate->action_code) {
 		temp_peer = tdls_find_peer(tdls_vdev, tdls_validate->peer_mac);
 		if (!temp_peer) {
-			tdls_err(QDF_MAC_ADDRESS_STR " peer doesn't exist",
+			tdls_err(QDF_MAC_ADDR_STR " peer doesn't exist",
 				     QDF_MAC_ADDR_ARRAY(
 				     tdls_validate->peer_mac));
 			return -EPERM;
@@ -772,7 +772,7 @@ int tdls_validate_mgmt_request(struct tdls_action_frame_request *tdls_mgmt_req)
 		if (TDLS_IS_LINK_CONNECTED(temp_peer))
 			tdls_validate->responder = temp_peer->is_responder;
 		else {
-			tdls_err(QDF_MAC_ADDRESS_STR " peer doesn't exist or not connected %d dialog_token %d status %d, tdls_validate->len = %zu",
+			tdls_err(QDF_MAC_ADDR_STR " peer doesn't exist or not connected %d dialog_token %d status %d, tdls_validate->len = %zu",
 				 QDF_MAC_ADDR_ARRAY(tdls_validate->peer_mac),
 				 temp_peer->link_status,
 				 tdls_validate->dialog_token,
@@ -889,7 +889,7 @@ tdls_activate_update_peer(struct tdls_update_peer_request *req)
 
 	curr_peer = tdls_get_peer(vdev_obj, mac);
 	if (!curr_peer) {
-		tdls_err(QDF_MAC_ADDRESS_STR " not exist. return invalid",
+		tdls_err(QDF_MAC_ADDR_STR " not exist. return invalid",
 			 QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_INVAL;
 		goto updatersp;
@@ -898,7 +898,7 @@ tdls_activate_update_peer(struct tdls_update_peer_request *req)
 	/* in change station, we accept only when sta_id is valid */
 	if (curr_peer->link_status > TDLS_LINK_CONNECTING ||
 	    !(TDLS_STA_INDEX_CHECK(curr_peer->sta_id))) {
-		tdls_err(QDF_MAC_ADDRESS_STR " link %d. sta %d. update peer %s",
+		tdls_err(QDF_MAC_ADDR_STR " link %d. sta %d. update peer %s",
 			 QDF_MAC_ADDR_ARRAY(mac), curr_peer->link_status,
 			 curr_peer->sta_id,
 			 (TDLS_STA_INDEX_CHECK(curr_peer->sta_id)) ? "ignored"
@@ -910,7 +910,7 @@ tdls_activate_update_peer(struct tdls_update_peer_request *req)
 
 	/* when others are on-going, we want to change link_status to idle */
 	if (tdls_is_progress(vdev_obj, mac, true)) {
-		tdls_notice(QDF_MAC_ADDRESS_STR " TDLS setuping. Req declined.",
+		tdls_notice(QDF_MAC_ADDR_STR " TDLS setuping. Req declined.",
 			    QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_PERM;
 		goto setlink;
@@ -918,7 +918,7 @@ tdls_activate_update_peer(struct tdls_update_peer_request *req)
 
 	curr_tdls_peers = tdls_get_connected_peer(soc_obj);
 	if (soc_obj->max_num_tdls_sta <= curr_tdls_peers) {
-		tdls_err(QDF_MAC_ADDRESS_STR
+		tdls_err(QDF_MAC_ADDR_STR
 			 " Request declined. Current: %d, Max allowed: %d.",
 			 QDF_MAC_ADDR_ARRAY(mac), curr_tdls_peers,
 			 soc_obj->max_num_tdls_sta);
@@ -1159,7 +1159,7 @@ QDF_STATUS tdls_process_del_peer(struct tdls_oper_request *req)
 	mac = req->peer_addr;
 	peer = tdls_find_peer(vdev_obj, mac);
 	if (!peer) {
-		tdls_err(QDF_MAC_ADDRESS_STR
+		tdls_err(QDF_MAC_ADDR_STR
 			 " not found, ignore NL80211_TDLS_ENABLE_LINK",
 			 QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_INVAL;
@@ -1404,7 +1404,7 @@ static QDF_STATUS tdls_add_peer_rsp(struct tdls_add_sta_rsp *rsp)
 				qdf_copy_macaddr(&conn_rec[sta_idx].peer_mac,
 						 &rsp->peermac);
 				tdls_warn("TDLS: STA IDX at %d is %d of mac "
-					  QDF_MAC_ADDRESS_STR, sta_idx,
+					  QDF_MAC_ADDR_STR, sta_idx,
 					  rsp->sta_id, QDF_MAC_ADDR_ARRAY
 					  (rsp->peermac.bytes));
 				break;
@@ -1467,7 +1467,7 @@ QDF_STATUS tdls_process_del_peer_rsp(struct tdls_del_sta_rsp *rsp)
 	const uint8_t *macaddr;
 	struct tdls_osif_indication ind;
 
-	tdls_debug("del peer rsp: vdev %d  peer " QDF_MAC_ADDRESS_STR,
+	tdls_debug("del peer rsp: vdev %d  peer " QDF_MAC_ADDR_STR,
 		   rsp->session_id, QDF_MAC_ADDR_ARRAY(rsp->peermac.bytes));
 	psoc = rsp->psoc;
 	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, rsp->session_id,
@@ -1495,7 +1495,7 @@ QDF_STATUS tdls_process_del_peer_rsp(struct tdls_del_sta_rsp *rsp)
 		tdls_warn("TDLS: del STA IDX = %x", rsp->sta_id);
 		curr_peer = tdls_find_peer(vdev_obj, macaddr);
 		if (curr_peer) {
-			tdls_debug(QDF_MAC_ADDRESS_STR " status is %d",
+			tdls_debug(QDF_MAC_ADDR_STR " status is %d",
 				   QDF_MAC_ADDR_ARRAY(macaddr),
 				   curr_peer->link_status);
 
@@ -1556,7 +1556,7 @@ tdls_wma_update_peer_state(struct tdls_soc_priv_obj *soc_obj,
 	struct scheduler_msg msg = {0,};
 	QDF_STATUS status;
 
-	tdls_debug("update TDLS peer " QDF_MAC_ADDRESS_STR " vdev %d, state %d",
+	tdls_debug("update TDLS peer " QDF_MAC_ADDR_STR " vdev %d, state %d",
 		   QDF_MAC_ADDR_ARRAY(peer_state->peer_macaddr),
 		   peer_state->vdev_id, peer_state->peer_state);
 	msg.type = soc_obj->tdls_update_peer_state;
@@ -1661,17 +1661,17 @@ QDF_STATUS tdls_process_enable_link(struct tdls_oper_request *req)
 	mac = req->peer_addr;
 	peer = tdls_find_peer(vdev_obj, mac);
 	if (!peer) {
-		tdls_err(QDF_MAC_ADDRESS_STR
+		tdls_err(QDF_MAC_ADDR_STR
 			 " not found, ignore NL80211_TDLS_ENABLE_LINK",
 			 QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_INVAL;
 		goto error;
 	}
 
-	tdls_debug("enable link for peer " QDF_MAC_ADDRESS_STR " link state %d",
+	tdls_debug("enable link for peer " QDF_MAC_ADDR_STR " link state %d",
 		   QDF_MAC_ADDR_ARRAY(mac), peer->link_status);
 	if (!TDLS_STA_INDEX_CHECK(peer->sta_id)) {
-		tdls_err("invalid sta idx %u for " QDF_MAC_ADDRESS_STR,
+		tdls_err("invalid sta idx %u for " QDF_MAC_ADDR_STR,
 			 peer->sta_id, QDF_MAC_ADDR_ARRAY(mac));
 		status = QDF_STATUS_E_INVAL;
 		goto error;
@@ -1757,7 +1757,7 @@ static QDF_STATUS tdls_config_force_peer(
 	struct tdls_peer_update_state *peer_update_param;
 
 	macaddr = req->peer_addr;
-	tdls_debug("NL80211_TDLS_SETUP for " QDF_MAC_ADDRESS_STR,
+	tdls_debug("NL80211_TDLS_SETUP for " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(macaddr));
 
 	vdev = req->vdev;
@@ -1785,7 +1785,7 @@ static QDF_STATUS tdls_config_force_peer(
 
 	peer = tdls_get_peer(vdev_obj, macaddr);
 	if (!peer) {
-		tdls_err("peer " QDF_MAC_ADDRESS_STR " does not exist",
+		tdls_err("peer " QDF_MAC_ADDR_STR " does not exist",
 			 QDF_MAC_ADDR_ARRAY(macaddr));
 		status = QDF_STATUS_E_NULL_VALUE;
 		goto error;
@@ -1847,7 +1847,7 @@ QDF_STATUS tdls_process_setup_peer(struct tdls_oper_request *req)
 	struct wlan_objmgr_vdev *vdev;
 	QDF_STATUS status;
 
-	tdls_debug("Configure external TDLS peer " QDF_MAC_ADDRESS_STR,
+	tdls_debug("Configure external TDLS peer " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(req->peer_addr));
 
 	/* reference cnt is acquired in ucfg_tdls_oper */
@@ -1893,7 +1893,7 @@ QDF_STATUS tdls_process_remove_force_peer(struct tdls_oper_request *req)
 	struct tdls_osif_indication ind;
 
 	macaddr = req->peer_addr;
-	tdls_debug("NL80211_TDLS_TEARDOWN for " QDF_MAC_ADDRESS_STR,
+	tdls_debug("NL80211_TDLS_TEARDOWN for " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(macaddr));
 
 	vdev = req->vdev;
@@ -1922,7 +1922,7 @@ QDF_STATUS tdls_process_remove_force_peer(struct tdls_oper_request *req)
 
 	peer = tdls_find_peer(vdev_obj, macaddr);
 	if (!peer) {
-		tdls_err("peer matching " QDF_MAC_ADDRESS_STR " not found",
+		tdls_err("peer matching " QDF_MAC_ADDR_STR " not found",
 			 QDF_MAC_ADDR_ARRAY(macaddr));
 		status = QDF_STATUS_E_NULL_VALUE;
 		goto error;
@@ -2013,7 +2013,7 @@ QDF_STATUS tdls_process_should_discover(struct wlan_objmgr_vdev *vdev,
 	vdev_obj = wlan_vdev_get_tdls_vdev_obj(vdev);
 	type = evt->message_type;
 
-	tdls_debug("TDLS %s: " QDF_MAC_ADDRESS_STR "reason %d",
+	tdls_debug("TDLS %s: " QDF_MAC_ADDR_STR "reason %d",
 		   tdls_evt_to_str(type),
 		   QDF_MAC_ADDR_ARRAY(evt->peermac.bytes),
 		   evt->peer_reason);
@@ -2070,7 +2070,7 @@ QDF_STATUS tdls_process_should_teardown(struct wlan_objmgr_vdev *vdev,
 	soc_obj = wlan_vdev_get_tdls_soc_obj(vdev);
 	vdev_obj = wlan_vdev_get_tdls_vdev_obj(vdev);
 
-	tdls_debug("TDLS %s: " QDF_MAC_ADDRESS_STR "reason %d",
+	tdls_debug("TDLS %s: " QDF_MAC_ADDR_STR "reason %d",
 		   tdls_evt_to_str(type),
 		   QDF_MAC_ADDR_ARRAY(evt->peermac.bytes), evt->peer_reason);
 
@@ -2088,7 +2088,7 @@ QDF_STATUS tdls_process_should_teardown(struct wlan_objmgr_vdev *vdev,
 
 	reason = evt->peer_reason;
 	if (TDLS_LINK_CONNECTED == curr_peer->link_status) {
-		tdls_err("%s reason: %d for" QDF_MAC_ADDRESS_STR,
+		tdls_err("%s reason: %d for" QDF_MAC_ADDR_STR,
 			 tdls_evt_to_str(type), evt->peer_reason,
 			 QDF_MAC_ADDR_ARRAY(evt->peermac.bytes));
 		if (reason == TDLS_TEARDOWN_RSSI ||

umac/tdls/core/src/wlan_tdls_ct.c

@@ -127,8 +127,8 @@ void tdls_discovery_timeout_peer_cb(void *user_data)
 							    &p_node);
 				continue;
 			}
-			tdls_debug(QDF_MAC_ADDRESS_STR " to idle state",
-				    QDF_MAC_ADDR_ARRAY(peer->peer_mac.bytes));
+			tdls_debug(QDF_MAC_ADDR_STR " to idle state",
+				   QDF_MAC_ADDR_ARRAY(peer->peer_mac.bytes));
 			tdls_set_peer_link_status(peer,
 						  TDLS_LINK_IDLE,
 						  TDLS_LINK_NOT_SUPPORTED);
@@ -379,8 +379,8 @@ void tdls_implicit_send_discovery_request(
 	/* This function is called in mutex_lock */
 	temp_peer = tdls_is_progress(tdls_vdev_obj, NULL, 0);
 	if (NULL != temp_peer) {
-		tdls_notice(QDF_MAC_ADDRESS_STR " ongoing. pre_setup ignored",
-			  QDF_MAC_ADDR_ARRAY(temp_peer->peer_mac.bytes));
+		tdls_notice(QDF_MAC_ADDR_STR " ongoing. pre_setup ignored",
+			    QDF_MAC_ADDR_ARRAY(temp_peer->peer_mac.bytes));
 		goto done;
 	}
 
@@ -446,7 +446,7 @@ int tdls_recv_discovery_resp(struct tdls_vdev_priv_obj *tdls_vdev,
 	if (0 == tdls_vdev->discovery_sent_cnt)
 		qdf_mc_timer_stop(&tdls_vdev->peer_discovery_timer);
 
-	tdls_debug("Discovery(%u) Response from " QDF_MAC_ADDRESS_STR
+	tdls_debug("Discovery(%u) Response from " QDF_MAC_ADDR_STR
 		   " link_status %d", tdls_vdev->discovery_sent_cnt,
 		   QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes),
 		   curr_peer->link_status);
@@ -462,7 +462,7 @@ int tdls_recv_discovery_resp(struct tdls_vdev_priv_obj *tdls_vdev,
 			tdls_set_peer_link_status(curr_peer,
 						TDLS_LINK_DISCOVERED,
 						TDLS_LINK_SUCCESS);
-			tdls_debug("Rssi Threshold met: " QDF_MAC_ADDRESS_STR
+			tdls_debug("Rssi Threshold met: " QDF_MAC_ADDR_STR
 				" rssi = %d threshold= %d",
 				QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes),
 				curr_peer->rssi,
@@ -477,8 +477,7 @@ int tdls_recv_discovery_resp(struct tdls_vdev_priv_obj *tdls_vdev,
 						TDLS_EVENT_SETUP_REQ,
 						&indication);
 		} else {
-			tdls_debug("Rssi Threshold not met: "
-				QDF_MAC_ADDRESS_STR
+			tdls_debug("Rssi Threshold not met: " QDF_MAC_ADDR_STR
 				" rssi = %d threshold = %d ",
 				QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes),
 				curr_peer->rssi,
@@ -601,7 +600,7 @@ tdls_ct_process_idle_handler(
 		return;
 	}
 
-	tdls_debug(QDF_MAC_ADDRESS_STR
+	tdls_debug(QDF_MAC_ADDR_STR
 		" tx_pkt: %d, rx_pkt: %d, idle_packet_n: %d",
 		QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes),
 		curr_peer->tx_pkt,
@@ -616,12 +615,12 @@ tdls_ct_process_idle_handler(
 	    (curr_peer->rx_pkt >=
 	     tdls_vdev_obj->threshold_config.idle_packet_n)) {
 		/* this tdls link got back to normal, so keep it */
-		tdls_debug("tdls link to " QDF_MAC_ADDRESS_STR
+		tdls_debug("tdls link to " QDF_MAC_ADDR_STR
 			 " back to normal, will stay",
 			  QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes));
 	} else {
 		/* this tdls link needs to get torn down */
-		tdls_notice("trigger tdls link to "QDF_MAC_ADDRESS_STR" down",
+		tdls_notice("trigger tdls link to "QDF_MAC_ADDR_STR" down",
 			    QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes));
 		tdls_indicate_teardown(tdls_vdev_obj,
 					curr_peer,
@@ -705,7 +704,7 @@ static void tdls_ct_process_connected_link(
 
 	if ((int32_t)curr_peer->rssi <
 	    (int32_t)tdls_vdev->threshold_config.rssi_teardown_threshold) {
-		tdls_warn("Tear down - low RSSI: " QDF_MAC_ADDRESS_STR "!",
+		tdls_warn("Tear down - low RSSI: " QDF_MAC_ADDR_STR "!",
 			 QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes));
 		tdls_indicate_teardown(tdls_vdev,
 					curr_peer,
@@ -736,7 +735,7 @@ static void tdls_ct_process_connected_link(
 		if (QDF_TIMER_STATE_RUNNING !=
 		    curr_peer->peer_idle_timer.state) {
 			tdls_warn("Tx/Rx Idle timer start: "
-				QDF_MAC_ADDRESS_STR "!",
+				QDF_MAC_ADDR_STR "!",
 				QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes));
 			tdls_timer_restart(tdls_vdev->vdev,
 				&curr_peer->peer_idle_timer,
@@ -744,7 +743,7 @@ static void tdls_ct_process_connected_link(
 		}
 	} else if (QDF_TIMER_STATE_RUNNING ==
 		   curr_peer->peer_idle_timer.state) {
-		tdls_warn("Tx/Rx Idle timer stop: " QDF_MAC_ADDRESS_STR "!",
+		tdls_warn("Tx/Rx Idle timer stop: " QDF_MAC_ADDR_STR "!",
 			 QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes));
 		qdf_mc_timer_stop(&curr_peer->peer_idle_timer);
 	}
@@ -853,7 +852,7 @@ static void tdls_ct_process_peers(struct tdls_peer *curr_peer,
 				  struct tdls_vdev_priv_obj *tdls_vdev_obj,
 				  struct tdls_soc_priv_obj *tdls_soc_obj)
 {
-	tdls_debug(QDF_MAC_ADDRESS_STR " link_status %d tdls_support %d",
+	tdls_debug(QDF_MAC_ADDR_STR " link_status %d tdls_support %d",
 		 QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes),
 		 curr_peer->link_status, curr_peer->tdls_support);
 
@@ -1116,7 +1115,7 @@ int tdls_set_tdls_offchannelmode(struct wlan_objmgr_vdev *vdev,
 	qdf_mem_copy(&chan_switch_params.peer_mac_addr,
 		     &conn_peer->peer_mac.bytes,
 		     QDF_MAC_ADDR_SIZE);
-	tdls_notice("Peer " QDF_MAC_ADDRESS_STR " vdevId: %d, off channel: %d, offset: %d, mode: %d, is_responder: %d",
+	tdls_notice("Peer " QDF_MAC_ADDR_STR " vdevId: %d, off channel: %d, offset: %d, mode: %d, is_responder: %d",
 		 QDF_MAC_ADDR_ARRAY(chan_switch_params.peer_mac_addr),
 		 chan_switch_params.vdev_id,
 		 chan_switch_params.tdls_off_ch,

umac/tdls/core/src/wlan_tdls_main.c

@@ -1058,7 +1058,7 @@ static int __tdls_get_all_peers_from_list(
 			if (buf_len < 32 + 1)
 				break;
 			len = qdf_scnprintf(buf, buf_len,
-				QDF_MAC_ADDRESS_STR "%3d%4s%3s%5d\n",
+				QDF_MAC_ADDR_STR "%3d%4s%3s%5d\n",
 				QDF_MAC_ADDR_ARRAY(curr_peer->peer_mac.bytes),
 				curr_peer->sta_id,
 				(curr_peer->tdls_support ==
@@ -1413,7 +1413,7 @@ QDF_STATUS tdls_scan_callback(struct tdls_soc_priv_obj *tdls_soc)
 	curr_peer = tdls_is_progress(tdls_vdev, NULL, 0);
 	if (NULL != curr_peer) {
 		if (tdls_soc->scan_reject_count++ >= TDLS_SCAN_REJECT_MAX) {
-			tdls_notice(QDF_MAC_ADDRESS_STR
+			tdls_notice(QDF_MAC_ADDR_STR
 				    ". scan rejected %d. force it to idle",
 				    QDF_MAC_ADDR_ARRAY(
 						curr_peer->peer_mac.bytes),

umac/tdls/core/src/wlan_tdls_mgmt.c

@@ -107,7 +107,7 @@ static QDF_STATUS tdls_process_rx_mgmt(
 						TDLS_PUBLIC_ACTION_DISC_RESP) {
 		mac = &rx_mgmt->buf[TDLS_80211_PEER_ADDR_OFFSET];
 		tdls_notice("[TDLS] TDLS Discovery Response,"
-		       QDF_MAC_ADDRESS_STR " RSSI[%d] <--- OTA",
+		       QDF_MAC_ADDR_STR " RSSI[%d] <--- OTA",
 		       QDF_MAC_ADDR_ARRAY(mac), rx_mgmt->rx_rssi);
 			tdls_recv_discovery_resp(tdls_vdev, mac);
 			tdls_set_rssi(tdls_vdev, mac, rx_mgmt->rx_rssi);

umac/tdls/core/src/wlan_tdls_peer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -59,7 +59,7 @@ struct tdls_peer *tdls_find_peer(struct tdls_vdev_priv_obj *vdev_obj,
 		status = qdf_list_peek_next(head, p_node, &p_node);
 	}
 
-	tdls_debug("no tdls peer " QDF_MAC_ADDRESS_STR,
+	tdls_debug("no tdls peer " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(macaddr));
 	return NULL;
 }
@@ -188,7 +188,7 @@ static struct tdls_peer *tdls_add_peer(struct tdls_vdev_priv_obj *vdev_obj,
 
 	qdf_list_insert_back(head, &peer->node);
 
-	tdls_debug("add tdls peer: " QDF_MAC_ADDRESS_STR,
+	tdls_debug("add tdls peer: " QDF_MAC_ADDR_STR,
 		   QDF_MAC_ADDR_ARRAY(macaddr));
 	return peer;
 }
@@ -222,7 +222,7 @@ tdls_find_progress_peer_in_list(qdf_list_t *head,
 			status = qdf_list_peek_next(head, p_node, &p_node);
 			continue;
 		} else if (TDLS_LINK_CONNECTING == peer->link_status) {
-			tdls_debug(QDF_MAC_ADDRESS_STR " TDLS_LINK_CONNECTING",
+			tdls_debug(QDF_MAC_ADDR_STR " TDLS_LINK_CONNECTING",
 				   QDF_MAC_ADDR_ARRAY(peer->peer_mac.bytes));
 			return peer;
 		}
@@ -353,7 +353,7 @@ tdls_find_first_connected_peer(struct tdls_vdev_priv_obj *vdev_obj)
 			peer = qdf_container_of(p_node, struct tdls_peer, node);
 
 			if (peer && TDLS_LINK_CONNECTED == peer->link_status) {
-				tdls_debug(QDF_MAC_ADDRESS_STR
+				tdls_debug(QDF_MAC_ADDR_STR
 					   " TDLS_LINK_CONNECTED",
 					   QDF_MAC_ADDR_ARRAY(
 						   peer->peer_mac.bytes));
@@ -795,7 +795,7 @@ void tdls_peer_idle_timers_destroy(struct tdls_vdev_priv_obj *vdev_obj)
 		while (QDF_IS_STATUS_SUCCESS(status)) {
 			peer = qdf_container_of(p_node, struct tdls_peer, node);
 			if (peer && peer->is_peer_idle_timer_initialised) {
-				tdls_debug(QDF_MAC_ADDRESS_STR
+				tdls_debug(QDF_MAC_ADDR_STR
 					   ": destroy  idle timer ",
 					   QDF_MAC_ADDR_ARRAY(
 						   peer->peer_mac.bytes));

umac/tdls/dispatcher/src/wlan_tdls_tgt_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -183,7 +183,7 @@ tgt_tdls_event_handler(struct wlan_objmgr_psoc *psoc,
 		tdls_err("psoc: 0x%pK, info: 0x%pK", psoc, info);
 		return QDF_STATUS_E_NULL_VALUE;
 	}
-	tdls_debug("vdev: %d, type: %d, reason: %d" QDF_MAC_ADDRESS_STR,
+	tdls_debug("vdev: %d, type: %d, reason: %d" QDF_MAC_ADDR_STR,
 		   info->vdev_id, info->message_type, info->peer_reason,
 		   QDF_MAC_ADDR_ARRAY(info->peermac.bytes));
 	notify = qdf_mem_malloc(sizeof(*notify));

umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c

@@ -449,7 +449,7 @@ QDF_STATUS ucfg_tdls_oper(struct wlan_objmgr_vdev *vdev,
 		return QDF_STATUS_E_NULL_VALUE;
 	}
 
-	tdls_debug("%s for peer " QDF_MAC_ADDRESS_STR,
+	tdls_debug("%s for peer " QDF_MAC_ADDR_STR,
 		   tdls_get_oper_str(cmd),
 		   QDF_MAC_ADDR_ARRAY(macaddr));