qcacld-3.0: Replace MAC_ADDRESS_STR with QDF_MAC_ADDR_STR
Replace MAC_ADDRESS_STR with converged macro QDF_MAC_ADDR_STR.
Change-Id: Ib9bd0a93a3ffdb89a42e11200d8b68ce1af86681
CRs-Fixed: 2433317
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index bad330b..7af987a 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -692,7 +692,7 @@
tLimMlmDeauthCnf mlmDeauthCnf;
tLimMlmPurgeStaInd mlmPurgeStaInd;
- pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "MAC_ADDRESS_STR,
+ pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "QDF_MAC_ADDR_STR,
pe_session->peSessionId, staDsAssocId,
mlmStaContext.cleanupTrigger, statusCode,
QDF_MAC_ADDR_ARRAY(sta_dsaddr.bytes));
@@ -892,7 +892,7 @@
{
tpDphHashNode sta_ds;
- 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,
+ 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: " QDF_MAC_ADDR_STR,
session_entry->peSessionId, auth_type, sub_type,
add_pre_auth_context, sta_id, delete_sta, result_code,
QDF_MAC_ADDR_ARRAY(peer_addr));
@@ -2150,7 +2150,7 @@
else
sta_Addr = &sta_mac;
- pe_debug(MAC_ADDRESS_STR ": Subtype(Assoc/Reassoc): %d",
+ pe_debug(QDF_MAC_ADDR_STR ": Subtype(Assoc/Reassoc): %d",
QDF_MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType);
qdf_mem_copy((uint8_t *) add_sta_params->staMac,
@@ -2681,7 +2681,7 @@
pe_debug("Sessionid %d :Sending SIR_HAL_DELETE_STA_REQ "
"for STAID: %X and AssocID: %d MAC : "
- MAC_ADDRESS_STR, pDelStaParams->sessionId,
+ QDF_MAC_ADDR_STR, pDelStaParams->sessionId,
pDelStaParams->staIdx, pDelStaParams->assocId,
QDF_MAC_ADDR_ARRAY(sta->staAddr));
@@ -2744,7 +2744,7 @@
(int)mac->roam.configParam.uCfgDot11Mode);
sir_copy_mac_addr(staMac, pe_session->selfMacAddr);
- pe_debug(MAC_ADDRESS_STR ": ", QDF_MAC_ADDR_ARRAY(staMac));
+ pe_debug(QDF_MAC_ADDR_STR ": ", QDF_MAC_ADDR_ARRAY(staMac));
pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams));
if (!pAddStaParams)
return QDF_STATUS_E_NOMEM;
@@ -2900,7 +2900,7 @@
msgQ.bodyptr = pAddStaParams;
msgQ.bodyval = 0;
- pe_debug(MAC_ADDRESS_STR ":Sessionid %d : "
+ pe_debug(QDF_MAC_ADDR_STR ":Sessionid %d : "
"Sending WMA_ADD_STA_REQ. (aid %d)",
QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac),
pAddStaParams->sessionId, pAddStaParams->assocId);
@@ -3369,7 +3369,7 @@
sizeof(tSirMacAddr));
pDelBssParams->smesessionId = pe_session->smeSessionId;
pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ "
- "for bss idx: %X BSSID:" MAC_ADDRESS_STR,
+ "for bss idx: %X BSSID:" QDF_MAC_ADDR_STR,
pDelBssParams->sessionId, pDelBssParams->bssIdx,
QDF_MAC_ADDR_ARRAY(pe_session->bssId));
/* we need to defer the message until we get the response back from HAL. */
@@ -3568,7 +3568,7 @@
pe_session->smeSessionId, updateEntry,
GET_LIM_SYSTEM_ROLE(pe_session));
- pe_debug("BSSID: " MAC_ADDRESS_STR,
+ pe_debug("BSSID: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE;
@@ -3743,7 +3743,7 @@
&pe_session->dph.dphHashTable);
if (!sta) {
pe_err("Couldn't get assoc id for " "MAC ADDR: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(
pAddBssParams->staContext.staMac));
return QDF_STATUS_E_FAILURE;
@@ -3757,7 +3757,7 @@
(uint8_t) pAssocRsp->capabilityInfo.shortPreamble;
pAddBssParams->staContext.updateSta = updateEntry;
- pe_debug("StaContext: " MAC_ADDRESS_STR
+ pe_debug("StaContext: " QDF_MAC_ADDR_STR
" shortPreambleSupported: %d",
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
pAddBssParams->staContext.shortPreambleSupported);
@@ -4113,7 +4113,7 @@
pe_session->smeSessionId, updateEntry,
GET_LIM_SYSTEM_ROLE(pe_session));
- pe_debug("BSSID: " MAC_ADDRESS_STR,
+ pe_debug("BSSID: " QDF_MAC_ADDR_STR,
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
@@ -4295,7 +4295,7 @@
(uint8_t) pBeaconStruct->capabilityInfo.shortPreamble;
pAddBssParams->staContext.updateSta = updateEntry;
- pe_debug("StaCtx: " MAC_ADDRESS_STR " shortPreamble: %d",
+ pe_debug("StaCtx: " QDF_MAC_ADDR_STR " shortPreamble: %d",
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
pAddBssParams->staContext.shortPreambleSupported);
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index f0150c9..f90714f 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -808,7 +808,7 @@
pAddBssParams->extSetStaKeyParam.staIdx = 0;
- pe_debug("BSSID: " MAC_ADDRESS_STR,
+ pe_debug("BSSID: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));
qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr,
diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c
index ba1951f..a9a9f4b 100644
--- a/core/mac/src/pe/lim/lim_ft_preauth.c
+++ b/core/mac/src/pe/lim/lim_ft_preauth.c
@@ -142,7 +142,7 @@
&session_id);
if (!session) {
pe_err("Unable to find session for the bssid"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
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,
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 c60922d..a0466c5 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1049,7 +1049,7 @@
prev_node = temp_node = mac_ctx->lim.gLimIbssPeerList;
- pe_debug(" PEER ADDR :" MAC_ADDRESS_STR,
+ pe_debug(" PEER ADDR :" QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_addr));
/** Compare Peer */
@@ -1109,7 +1109,7 @@
tpDphHashNode sta = NULL;
uint16_t peer_idx = 0;
- pe_debug("Delete peer :" MAC_ADDRESS_STR,
+ pe_debug("Delete peer :" QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_addr));
sta = dph_lookup_hash_entry(mac_ctx, mac_addr,
@@ -1174,7 +1174,7 @@
status = eSIR_SME_REFUSED;
goto skip_event;
}
- pe_debug("Deleted STA associd %d staId %d MAC " MAC_ADDRESS_STR,
+ pe_debug("Deleted STA associd %d staId %d MAC " QDF_MAC_ADDR_STR,
sta_ds->assocId, sta_ds->staIndex,
QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
@@ -1215,14 +1215,14 @@
dph_lookup_hash_entry(mac, pAddStaParams->staMac, &peerIdx,
&pe_session->dph.dphHashTable);
if (!sta) {
- pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "MAC_ADDRESS_STR,
+ pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
qdf_mem_free(pAddStaParams);
return QDF_STATUS_E_FAILURE;
}
if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
- pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"MAC_ADDRESS_STR,
+ pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"QDF_MAC_ADDR_STR,
pAddStaParams->status,
QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
lim_ibss_delete_peer(mac,
@@ -1448,8 +1448,8 @@
sir_copy_mac_addr(currentBssId, pe_session->bssId);
- pe_debug("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :"
- MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(currentBssId),
+ pe_debug("Current BSSID :" QDF_MAC_ADDR_STR " Received BSSID :"
+ QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(currentBssId),
QDF_MAC_ADDR_ARRAY(pHdr->bssId));
/* Check for IBSS Coalescing only if Beacon is from different BSS */
@@ -1484,7 +1484,7 @@
*/
mac->lim.gLimIbssCoalescingHappened = true;
ibss_coalesce_save(mac, pHdr, pBeacon);
- pe_debug("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR,
+ pe_debug("IBSS Coalescing happened Delete BSSID :" QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(currentBssId));
lim_ibss_bss_delete(mac, pe_session);
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 3ae3f4c..c187a75 100644
--- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c
+++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c
@@ -147,7 +147,7 @@
pe_debug("Received SIR_LIM_DELETE_STA_CONTEXT_IND for "
"STA that either has no context or "
"in some transit state, Addr = "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(msg->bssId));
return;
}
@@ -421,7 +421,7 @@
mac->lim.gLimHeartBeatApMacIndex = 1;
pe_debug("HB Failure on MAC "
- MAC_ADDRESS_STR" Store it on Index %d",
+ QDF_MAC_ADDR_STR" Store it on Index %d",
QDF_MAC_ADDR_ARRAY(sta->staAddr), apCount);
sir_copy_mac_addr(mac->lim.gLimHeartBeatApMac[apCount],
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 2046f30..e6f4680 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
@@ -174,7 +174,7 @@
}
sta_ds->sta_deletion_in_progress = true;
pe_err("Sending Disassoc and Deleting existing STA entry:"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(session->selfMacAddr));
lim_send_disassoc_mgmt_frame(mac_ctx,
eSIR_MAC_UNSPEC_FAILURE_REASON,
@@ -285,7 +285,7 @@
return true;
pe_warn("Assoc Req rejected: frame parsing error. source addr:"
- MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa));
+ QDF_MAC_ADDR_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;
@@ -321,7 +321,7 @@
if (lim_compare_capabilities(mac_ctx, assoc_req,
local_cap, session) == false) {
pe_warn("Rcvd %s Req with unsupported capab from"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
/*
@@ -357,7 +357,7 @@
return true;
pe_err("%s Req with ssid wrong(Rcvd: %.*s self: %.*s) from "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
assoc_req->ssId.length, assoc_req->ssId.ssId,
session->ssId.length, session->ssId.ssId,
@@ -414,7 +414,7 @@
return true;
pe_warn("Assoc Req rejected: unsupported rates, soruce addr: %s"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
/*
@@ -447,7 +447,7 @@
(session->dot11mode == MLME_DOT11_MODE_11G_ONLY) &&
(assoc_req->HTCaps.present)) {
pe_err("SOFTAP was in 11G only mode, rejecting legacy STA: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx,
eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
@@ -477,7 +477,7 @@
(session->dot11mode == MLME_DOT11_MODE_11N_ONLY) &&
(!assoc_req->HTCaps.present)) {
pe_err("SOFTAP was in 11N only mode, rejecting legacy STA: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx,
eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
@@ -644,14 +644,14 @@
*/
if (!assoc_req->powerCapabilityPresent) {
pe_warn("LIM Info: Missing Power capability IE in %s Req from "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc",
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,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
@@ -663,7 +663,7 @@
mac_ctx, assoc_req, session);
if (QDF_STATUS_SUCCESS != status) {
pe_warn("LIM Info: MinTxPower(STA) > MaxTxPower(AP) in %s Req from "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
@@ -672,7 +672,7 @@
mac_ctx, assoc_req);
if (QDF_STATUS_SUCCESS != status) {
pe_warn("LIM Info: wrong supported channels (STA) in %s Req from "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
@@ -718,7 +718,7 @@
if ((assoc_req->HTCaps.present) && (lim_check_mcs_set(mac_ctx,
assoc_req->HTCaps.supportedMCSSet) == false)) {
pe_warn("rcvd %s req with unsupported MCS Rate Set from "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
/*
@@ -972,12 +972,12 @@
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, QDF_MAC_ADDR_ARRAY(hdr->sa));
+ QDF_MAC_ADDR_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,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
/*
* rcvd Assoc req frame with RSN IE but
@@ -1010,7 +1010,7 @@
pmf_connection);
if (eSIR_MAC_SUCCESS_STATUS != status) {
pe_warn("Re/Assoc rejected from: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, status,
@@ -1019,7 +1019,7 @@
return false;
}
} else {
- pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR,
+ pe_warn("Re/Assoc rejected from: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
/*
* rcvd Assoc req frame with RSN IE but
@@ -1037,7 +1037,7 @@
status = lim_check_sae_pmf_cap(session, &dot11f_ie_rsn);
if (eSIR_MAC_SUCCESS_STATUS != status) {
/* Reject pmf disable SAE STA */
- pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR,
+ pe_warn("Re/Assoc rejected from: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, status,
1, hdr->sa, sub_type,
@@ -1048,7 +1048,7 @@
} else if (assoc_req->wpaPresent) {
if (!(assoc_req->wpa.length)) {
pe_warn("Re/Assoc rejected from: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
/* rcvd Assoc req frame with invalid WPA IE length */
@@ -1075,7 +1075,7 @@
&dot11f_ie_wpa);
if (eSIR_MAC_SUCCESS_STATUS != status) {
pe_warn("Re/Assoc rejected from: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
/*
* rcvd Assoc req frame with WPA IE
@@ -1190,7 +1190,7 @@
hdr->sa, session, false);
pe_warn("rcvd %s req, sessionid: %d, without pre-auth ctx"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa));
return false;
@@ -1646,7 +1646,7 @@
&assoc_req->he_cap) != QDF_STATUS_SUCCESS) {
/* Could not update hash table entry at DPH with rateset */
pe_err("Couldn't update hash entry for aid: %d MacAddr: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa));
/* Release AID */
@@ -2005,7 +2005,7 @@
return false;
/* STA is Associated ! */
- pe_debug("Received: %s Req successful from " MAC_ADDRESS_STR,
+ pe_debug("Received: %s Req successful from " QDF_MAC_ADDR_STR,
(sub_type == LIM_ASSOC) ? "Assoc" : "ReAssoc",
QDF_MAC_ADDR_ARRAY(hdr->sa));
@@ -2036,7 +2036,7 @@
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, QDF_MAC_ADDR_ARRAY(hdr->sa));
+ QDF_MAC_ADDR_STR, peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa));
/* Release AID */
lim_release_peer_idx(mac_ctx, peer_idx, session);
@@ -2120,14 +2120,14 @@
frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
pe_debug("Rcvd: %s Req Frame sessionid: %d systemrole: %d MlmState: %d from: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
session->peSessionId, GET_LIM_SYSTEM_ROLE(session),
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,
+ QDF_MAC_ADDR_STR,
session->peSessionId, sub_type,
GET_LIM_SYSTEM_ROLE(session),
QDF_MAC_ADDR_ARRAY(hdr->sa));
@@ -2138,7 +2138,7 @@
}
if (session->limMlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE) {
pe_err("drop ASSOC REQ on sessionid: %d "
- "role: %d from: "MAC_ADDRESS_STR" in limMlmState: %d",
+ "role: %d from: "QDF_MAC_ADDR_STR" in limMlmState: %d",
session->peSessionId,
GET_LIM_SYSTEM_ROLE(session),
QDF_MAC_ADDR_ARRAY(hdr->sa),
@@ -2158,7 +2158,7 @@
if (sta_ds) {
if (hdr->fc.retry > 0) {
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,
+ QDF_MAC_ADDR_STR, session->peSessionId,
sub_type, GET_LIM_SYSTEM_ROLE(session),
QDF_MAC_ADDR_ARRAY(hdr->sa));
return;
@@ -2187,7 +2187,7 @@
sub_type,
sta_ds, session);
pe_err("DUT already received an assoc request frame and STA is sending another assoc req.So, do not Process sessionid: %d sys sub_type: %d for role: %d from: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
session->peSessionId, sub_type,
session->limSystemRole,
QDF_MAC_ADDR_ARRAY(hdr->sa));
@@ -2222,7 +2222,7 @@
* ignore it
*/
pe_err("Rcvd: %s Req, sessionid: %d from a BC/MC address"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa));
return;
@@ -2576,7 +2576,7 @@
sub_type = LIM_ASSOC;
pe_debug("Sessionid: %d ssid: %s sub_type: %d Associd: %d staAddr: "
- MAC_ADDRESS_STR, session_entry->peSessionId,
+ QDF_MAC_ADDR_STR, session_entry->peSessionId,
assoc_req->ssId.ssId, sub_type, sta_ds->assocId,
QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
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 4222f85..46d45eb 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
@@ -514,7 +514,7 @@
}
pe_debug("received Re/Assoc: %d resp on sessionid: %d systemrole: %d"
- " and mlmstate: %d RSSI: %d from "MAC_ADDRESS_STR, subtype,
+ " and mlmstate: %d RSSI: %d from "QDF_MAC_ADDR_STR, subtype,
session_entry->peSessionId, GET_LIM_SYSTEM_ROLE(session_entry),
session_entry->limMlmState,
(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)),
@@ -573,7 +573,7 @@
* other than one to which request was initiated.
* Ignore this and wait until Assoc Failure Timeout
*/
- pe_warn("received AssocRsp from unexpected peer "MAC_ADDRESS_STR,
+ pe_warn("received AssocRsp from unexpected peer "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
qdf_mem_free(beacon);
return;
@@ -587,7 +587,7 @@
* other than one to which request was initiated.
* Ignore this and wait until Reassoc Failure Timeout.
*/
- pe_warn("received ReassocRsp from unexpected peer "MAC_ADDRESS_STR,
+ pe_warn("received ReassocRsp from unexpected peer "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
qdf_mem_free(beacon);
return;
@@ -938,7 +938,7 @@
qdf_mem_free(beacon);
return;
}
- pe_debug("Successfully Associated with BSS " MAC_ADDRESS_STR,
+ pe_debug("Successfully Associated with BSS " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(hdr->sa));
#ifdef FEATURE_WLAN_ESE
if (session_entry->eseContext.tsm.tsmInfo.state)
@@ -1042,7 +1042,7 @@
&& (session_entry->limMlmState ==
eLIM_MLM_WT_FT_REASSOC_RSP_STATE))) {
pe_err("Assoc Rejected by the peer mlmestate: %d sessionid: %d Reason: %d MACADDR:"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
session_entry->limMlmState,
session_entry->peSessionId,
assoc_cnf.resultCode, QDF_MAC_ADDR_ARRAY(hdr->sa));
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 594e7db..e3e28b7 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -151,7 +151,7 @@
cfg_privacy_opt_imp = (uint8_t) val;
if (!cfg_privacy_opt_imp) {
pe_err("rx Auth frame for unsupported auth algorithm %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
@@ -442,7 +442,7 @@
&pMlmDisassocReq->peer_macaddr.bytes,
QDF_MAC_ADDR_SIZE))) {
pe_debug("TODO:Ack for disassoc frame is pending Issue delsta for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(
pMlmDisassocReq->peer_macaddr.bytes));
lim_process_disassoc_ack_timeout(mac_ctx);
@@ -455,7 +455,7 @@
&pMlmDeauthReq->peer_macaddr.bytes,
QDF_MAC_ADDR_SIZE))) {
pe_debug("TODO:Ack for deauth frame is pending Issue delsta for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(
pMlmDeauthReq->peer_macaddr.bytes));
lim_process_deauth_ack_timeout(mac_ctx);
@@ -608,7 +608,7 @@
break;
default:
pe_err("rx Auth frm for unsupported auth algo %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
@@ -632,7 +632,7 @@
}
} else {
pe_err("received Authentication frame for unsupported auth algorithm %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
@@ -721,7 +721,7 @@
*/
pe_warn("received Auth frame2 from unexpected peer"
- MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
+ QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
}
@@ -760,7 +760,7 @@
*/
pe_warn("rx Auth frame2 for unexpected auth algo %d"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
@@ -773,7 +773,7 @@
* Return Auth confirm with received failure code to SME
*/
pe_err("rx Auth frame from peer with failure code %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authStatusCode,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED,
@@ -829,7 +829,7 @@
*/
pe_err("rx Auth frm from peer for unsupported auth algo %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
@@ -933,7 +933,7 @@
/* AuthFrame 3 */
if (rx_auth_frm_body->authAlgoNumber != eSIR_SHARED_KEY) {
pe_err("rx Auth frame3 from peer with auth algo number %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
@@ -960,7 +960,7 @@
*/
if (!mac_hdr->fc.wep) {
pe_err("received Auth frame3 from peer with no WEP bit set "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* WEP bit is not set in FC of Auth Frame3 */
auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
@@ -978,7 +978,7 @@
auth_node = lim_search_pre_auth_list(mac_ctx, mac_hdr->sa);
if (!auth_node) {
pe_warn("received AuthFrame3 from peer that has no preauth context "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
* No 'pre-auth' context exists for this STA that sent
@@ -998,7 +998,7 @@
if (auth_node->mlmState == eLIM_MLM_AUTH_RSP_TIMEOUT_STATE) {
pe_warn("auth response timer timedout for peer "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
* Received Auth Frame3 after Auth Response timeout.
@@ -1026,7 +1026,7 @@
* to delete STA context.
*/
pe_err("rx Auth frm3 from peer with status code %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authStatusCode,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
@@ -1061,7 +1061,7 @@
pe_session);
return;
} else {
- pe_warn("Challenge failure for peer "MAC_ADDRESS_STR,
+ pe_warn("Challenge failure for peer "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
* Challenge Failure.
@@ -1096,7 +1096,7 @@
* Log error and ignore the frame.
*/
pe_warn("received unexpected Auth frame4 from peer in state %d, addr "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
pe_session->limMlmState,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
@@ -1110,7 +1110,7 @@
* failure to SME.
*/
pe_err("received Auth frame4 from peer with invalid auth algo %d"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authAlgoNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
@@ -1125,7 +1125,7 @@
* Wait until Authentication Failure Timeout.
*/
- pe_warn("received Auth frame4 from unexpected peer "MAC_ADDRESS_STR,
+ pe_warn("received Auth frame4 from unexpected peer "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
}
@@ -1139,7 +1139,7 @@
*/
pe_err("received Authentication frame from peer with invalid auth seq number %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
rx_auth_frm_body->authTransactionSeqNumber,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
@@ -1175,7 +1175,7 @@
* Authentication failure.
* Return Auth confirm with received failure code to SME
*/
- pe_err("Authentication failure from peer "MAC_ADDRESS_STR,
+ pe_err("Authentication failure from peer "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED,
rx_auth_frm_body->authStatusCode,
@@ -1256,7 +1256,7 @@
curr_seq_num = (mac_hdr->seqControl.seqNumHi << 4) |
(mac_hdr->seqControl.seqNumLo);
- pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "MAC_ADDRESS_STR" RSSI: %d",
+ pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "QDF_MAC_ADDR_STR" RSSI: %d",
pe_session->peSessionId, GET_LIM_SYSTEM_ROLE(pe_session),
pe_session->limMlmState, QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)));
@@ -1378,7 +1378,7 @@
if (!cfg_privacy_opt_imp) {
pe_err("received Authentication frame3 from peer that while privacy option is turned OFF "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
* Privacy option is not implemented.
@@ -1407,7 +1407,7 @@
auth_node = lim_search_pre_auth_list(mac_ctx, mac_hdr->sa);
if (!auth_node) {
pe_err("rx Auth frame with no preauth ctx with WEP bit set "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
* No 'pre-auth' context exists for this STA
@@ -1434,7 +1434,7 @@
(auth_node->mlmState !=
eLIM_MLM_AUTH_RSP_TIMEOUT_STATE)) {
pe_err("received Authentication frame from peer that is in state %d "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
auth_node->mlmState,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/*
@@ -1495,7 +1495,7 @@
SIR_MAC_WEP_IV_LENGTH));
if (decrypt_result == LIM_DECRYPT_ICV_FAIL) {
pe_err("received Authentication frame from peer that failed decryption: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* ICV failure */
lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa);
@@ -1629,7 +1629,7 @@
pBody = WMA_GET_RX_MPDU_DATA(pBd);
frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd);
- pe_debug("Auth Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)",
+ pe_debug("Auth Frame Received: BSSID " QDF_MAC_ADDR_STR " (RSSI %d)",
QDF_MAC_ADDR_ARRAY(pHdr->bssId),
(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(pBd)));
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 6333231..6da9fb7 100644
--- a/core/mac/src/pe/lim/lim_process_deauth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c
@@ -147,10 +147,10 @@
/* Get reasonCode from Deauthentication frame body */
reasonCode = sir_read_u16(pBody);
- pe_debug("Received Deauth frame for Addr: " MAC_ADDRESS_STR
+ pe_debug("Received Deauth frame for Addr: " QDF_MAC_ADDR_STR
"(mlm state = %s, sme state = %d systemrole = %d "
"RSSI = %d) with reason code %d [%s] from "
- MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->da),
+ QDF_MAC_ADDR_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,
@@ -188,7 +188,7 @@
/* Invalid reasonCode in received Deauthentication frame */
/* Log error and ignore the frame */
pe_err("received Deauth frame with invalid reasonCode %d from "
- MAC_ADDRESS_STR, reasonCode,
+ QDF_MAC_ADDR_STR, reasonCode,
QDF_MAC_ADDR_ARRAY(pHdr->sa));
break;
@@ -208,7 +208,7 @@
/* Invalid reasonCode in received Deauth frame */
/* Log error and ignore the frame */
pe_err("received Deauth frame with invalid reasonCode %d from "
- MAC_ADDRESS_STR, reasonCode,
+ QDF_MAC_ADDR_STR, reasonCode,
QDF_MAC_ADDR_ARRAY(pHdr->sa));
break;
@@ -217,7 +217,7 @@
/* Received Deauth frame in either IBSS */
/* or un-known role. Log and ignore it */
pe_err("received Deauth frame with reasonCode %d in role %d from "
- MAC_ADDRESS_STR, reasonCode,
+ QDF_MAC_ADDR_STR, reasonCode,
GET_LIM_SYSTEM_ROLE(pe_session),
QDF_MAC_ADDR_ARRAY(pHdr->sa));
@@ -272,8 +272,8 @@
}
if (!IS_REASSOC_BSSID(mac, pHdr->sa, pe_session)) {
pe_debug("Rcv Deauth from unknown/different "
- "AP while ReAssoc. Ignore " MAC_ADDRESS_STR
- "limReAssocbssId : " MAC_ADDRESS_STR,
+ "AP while ReAssoc. Ignore " QDF_MAC_ADDR_STR
+ "limReAssocbssId : " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pHdr->sa),
QDF_MAC_ADDR_ARRAY(pe_session->limReAssocbssId));
return;
@@ -284,8 +284,8 @@
*/
if (!IS_CURRENT_BSSID(mac, pHdr->sa, pe_session)) {
pe_debug("received DeAuth from the New AP to "
- "which ReAssoc is sent " MAC_ADDRESS_STR
- "pe_session->bssId: " MAC_ADDRESS_STR,
+ "which ReAssoc is sent " QDF_MAC_ADDR_STR
+ "pe_session->bssId: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pHdr->sa),
QDF_MAC_ADDR_ARRAY(pe_session->bssId));
@@ -304,7 +304,7 @@
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, QDF_MAC_ADDR_ARRAY(pHdr->sa));
+ QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa));
if (lim_search_pre_auth_list(mac, pHdr->sa)) {
pe_debug("Preauth entry exist. Deleting");
@@ -346,7 +346,7 @@
*/
pe_debug("received Deauth frame state %X with failure "
- "code %d from " MAC_ADDRESS_STR,
+ "code %d from " QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
@@ -358,7 +358,7 @@
case eLIM_MLM_AUTHENTICATED_STATE:
pe_debug("received Deauth frame state %X with "
- "reasonCode=%d from " MAC_ADDRESS_STR,
+ "reasonCode=%d from " QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
/* / Issue Deauth Indication to SME. */
@@ -384,7 +384,7 @@
* if any and issue ASSOC_CNF to SME.
*/
pe_debug("received Deauth frame state %X with "
- "reasonCode=%d from " MAC_ADDRESS_STR,
+ "reasonCode=%d from " QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
if (lim_search_pre_auth_list(mac_ctx, addr))
@@ -421,7 +421,7 @@
case eLIM_MLM_WT_ADD_STA_RSP_STATE:
pe_session->fDeauthReceived = true;
pe_debug("Received Deauth frame in state %X with Reason "
- "Code %d from Peer" MAC_ADDRESS_STR,
+ "Code %d from Peer" QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
return;
@@ -433,7 +433,7 @@
&& (STA_ENTRY_TDLS_PEER == sta_ds->staType)) {
pe_err("received Deauth frame in state %X with "
"reason code %d from Tdls peer"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
lim_send_sme_tdls_del_sta_ind(mac_ctx, sta_ds,
@@ -463,21 +463,21 @@
case eLIM_MLM_WT_REASSOC_RSP_STATE:
pe_err("received Deauth frame state %X with "
- "reasonCode=%d from " MAC_ADDRESS_STR,
+ "reasonCode=%d from " QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
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,
+ "reasonCode=%d from " QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
break;
default:
pe_err("received Deauth frame in state %X with "
- "reasonCode=%d from " MAC_ADDRESS_STR,
+ "reasonCode=%d from " QDF_MAC_ADDR_STR,
pe_session->limMlmState, rc,
QDF_MAC_ADDR_ARRAY(addr));
return;
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 af6c285..5ecf2f9 100644
--- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c
+++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
@@ -146,9 +146,9 @@
/* Get reasonCode from Disassociation frame body */
reasonCode = sir_read_u16(pBody);
- pe_debug("Received Disassoc frame for Addr: " MAC_ADDRESS_STR
+ pe_debug("Received Disassoc frame for Addr: " QDF_MAC_ADDR_STR
"(mlm state=%s, sme state=%d RSSI=%d),"
- "with reason code %d [%s] from " MAC_ADDRESS_STR,
+ "with reason code %d [%s] from " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pHdr->da),
lim_mlm_state_str(pe_session->limMlmState),
pe_session->limSmeState, frame_rssi, reasonCode,
@@ -179,7 +179,7 @@
* Log error.
*/
pe_err("received Disassoc frame from STA that does not have context"
- "reasonCode=%d, addr " MAC_ADDRESS_STR,
+ "reasonCode=%d, addr " QDF_MAC_ADDR_STR,
reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa));
return;
}
@@ -245,7 +245,7 @@
default:
/* Invalid reasonCode in received Disassociation frame */
- pe_warn("received Disassoc frame with invalid reasonCode: %d from " MAC_ADDRESS_STR,
+ pe_warn("received Disassoc frame with invalid reasonCode: %d from " QDF_MAC_ADDR_STR,
reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa));
break;
}
@@ -261,7 +261,7 @@
/* as long as we're not about to channel switch */
if (pe_session->gLimChannelSwitch.state !=
eLIM_CHANNEL_SWITCH_IDLE) {
- pe_err("Ignoring disassoc frame due to upcoming channel switch, from "MAC_ADDRESS_STR,
+ pe_err("Ignoring disassoc frame due to upcoming channel switch, from "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pHdr->sa));
return;
}
@@ -274,7 +274,7 @@
/* Received Disassociation frame in either IBSS */
/* or un-known role. Log and ignore it */
pe_err("received Disassoc frame with invalid reasonCode: %d in role:"
- "%d in sme state: %d from " MAC_ADDRESS_STR, reasonCode,
+ "%d in sme state: %d from " QDF_MAC_ADDR_STR, reasonCode,
GET_LIM_SYSTEM_ROLE(pe_session), pe_session->limSmeState,
QDF_MAC_ADDR_ARRAY(pHdr->sa));
@@ -304,7 +304,7 @@
eLIM_MLM_WT_ASSOC_CNF_STATE)
sta->mlmStaContext.updateContext = 1;
- pe_err("received Disassoc frame from peer that is in state: %X, addr "MAC_ADDRESS_STR,
+ pe_err("received Disassoc frame from peer that is in state: %X, addr "QDF_MAC_ADDR_STR,
sta->mlmStaContext.mlmState,
QDF_MAC_ADDR_ARRAY(pHdr->sa));
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 53677f5..4dad389 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -1754,7 +1754,7 @@
msg->bodyptr,
sizeof(tSirP2PNoaAttr));
pe_debug("bssId"
- MAC_ADDRESS_STR
+ QDF_MAC_ADDR_STR
" ctWin=%d oppPsFlag=%d",
QDF_MAC_ADDR_ARRAY(
session_entry->bssId),
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 9439116..a372ac7 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
@@ -72,7 +72,7 @@
return;
}
- pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " MAC_ADDRESS_STR,
+ pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " QDF_MAC_ADDR_STR,
reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState,
QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
@@ -86,7 +86,7 @@
* parameters code.
*/
- pe_warn("unexpect msg state: %X role: %d MAC" MAC_ADDRESS_STR,
+ pe_warn("unexpect msg state: %X role: %d MAC" QDF_MAC_ADDR_STR,
session->limMlmState, GET_LIM_SYSTEM_ROLE(session),
QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState);
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 0a56932..171aa84 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
@@ -891,7 +891,7 @@
session->ssId.ssId,
session->ssId.length);
- pe_debug("vdev_id %d ssid %.*s "MAC_ADDRESS_STR"",
+ pe_debug("vdev_id %d ssid %.*s "QDF_MAC_ADDR_STR,
sae_info->vdev_id,
sae_info->ssid.length,
sae_info->ssid.ssId,
@@ -970,7 +970,7 @@
}
pe_debug("Process Auth Req sessionID %d Systemrole %d"
- "mlmstate %d from: " MAC_ADDRESS_STR
+ "mlmstate %d from: " QDF_MAC_ADDR_STR
" with authtype %d", session_id,
GET_LIM_SYSTEM_ROLE(session), session->limMlmState,
QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr),
@@ -996,7 +996,7 @@
*/
if (lim_is_preauth_ctx_exists(mac_ctx, session, &preauth_node)) {
pe_debug("Already have pre-auth context with peer: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr));
mlm_auth_cnf.resultCode = (tSirResultCodes)
eSIR_MAC_SUCCESS_STATUS;
@@ -1154,7 +1154,7 @@
* Return Assoc confirm with Invalid parameters code.
*/
pe_warn("received unexpected MLM_ASSOC_CNF in state %X for role=%d, MAC addr= "
- MAC_ADDRESS_STR, session_entry->limMlmState,
+ QDF_MAC_ADDR_STR, session_entry->limMlmState,
GET_LIM_SYSTEM_ROLE(session_entry),
QDF_MAC_ADDR_ARRAY(mlm_assoc_req->peerMacAddr));
lim_print_mlm_state(mac_ctx, LOGW, session_entry->limMlmState);
@@ -1252,7 +1252,7 @@
}
pe_debug("Process DisAssoc Req on sessionID %d Systemrole %d"
- "mlmstate %d from: " MAC_ADDRESS_STR,
+ "mlmstate %d from: " QDF_MAC_ADDR_STR,
mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState,
QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
@@ -1278,7 +1278,7 @@
return;
}
- pe_debug("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR,
+ pe_debug("send disassoc rsp with ret code %d for" QDF_MAC_ADDR_STR,
eSIR_SME_DEAUTH_STATUS,
QDF_MAC_ADDR_ARRAY(
mlm_disassocreq->peer_macaddr.bytes));
@@ -1334,7 +1334,7 @@
* Received LIM_MLM_DISASSOC_REQ for STA that does not
* have context or in some transit state.
*/
- pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR,
+ pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
if (stads)
pe_err("Sta MlmState: %d", stads->mlmStaContext.mlmState);
@@ -1541,7 +1541,7 @@
}
mlm_disassoc_req = (tLimMlmDisassocReq *) msg_buf;
- pe_debug("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR,
+ pe_debug("Process disassoc req, sessionID %d from: "QDF_MAC_ADDR_STR,
mlm_disassoc_req->sessionId,
QDF_MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes));
@@ -1588,7 +1588,7 @@
return;
}
pe_debug("Process Deauth Req on sessionID %d Systemrole %d"
- "mlmstate %d from: " MAC_ADDRESS_STR,
+ "mlmstate %d from: " QDF_MAC_ADDR_STR,
mlm_deauth_req->sessionId,
GET_LIM_SYSTEM_ROLE(session),
session->limMlmState,
@@ -1611,8 +1611,8 @@
if (qdf_mem_cmp(mlm_deauth_req->peer_macaddr.bytes,
curr_bssId, QDF_MAC_ADDR_SIZE)) {
pe_err("received MLM_DEAUTH_REQ with invalid BSS id "
- "Peer MAC: "MAC_ADDRESS_STR
- " CFG BSSID Addr : "MAC_ADDRESS_STR,
+ "Peer MAC: "QDF_MAC_ADDR_STR
+ " CFG BSSID Addr : "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes),
QDF_MAC_ADDR_ARRAY(curr_bssId));
@@ -1627,7 +1627,7 @@
return;
}
- pe_debug("send deauth rsp with ret code %d for" MAC_ADDRESS_STR,
+ pe_debug("send deauth rsp with ret code %d for" QDF_MAC_ADDR_STR,
eSIR_SME_DEAUTH_STATUS,
QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes));
@@ -1673,7 +1673,7 @@
break;
default:
pe_warn("received MLM_DEAUTH_REQ with in state %d for peer "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
session->limMlmState,
QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes));
@@ -1724,7 +1724,7 @@
*/
pe_warn("received MLM_DEAUTH_REQ in mlme state %d for STA that "
"does not have context, Addr="
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
session->limMlmState,
QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes));
@@ -1750,7 +1750,7 @@
* received MLM_DEAUTH_REQ for STA that either has no context or
* in some transit state
*/
- pe_warn("Invalid MLM_DEAUTH_REQ, Addr="MAC_ADDRESS_STR,
+ pe_warn("Invalid MLM_DEAUTH_REQ, Addr="QDF_MAC_ADDR_STR,
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;
@@ -1833,7 +1833,7 @@
mlm_deauth_req = (tLimMlmDeauthReq *) msg_buf;
pe_debug("Process Deauth Req on sessionID %d from: "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
mlm_deauth_req->sessionId,
QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
@@ -1917,7 +1917,7 @@
(!qdf_is_macaddr_equal(&mlm_set_keys_req->peer_macaddr,
&curr_bssid))) {
pe_debug("Received MLM_SETKEYS_REQ with invalid BSSID"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mlm_set_keys_req->
peer_macaddr.bytes));
/*
@@ -1985,7 +1985,7 @@
* have context or in some transit state.
*/
pe_debug("Invalid MLM_SETKEYS_REQ, Addr = "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mlm_set_keys_req->
peer_macaddr.bytes));
/* Prepare and Send LIM_MLM_SETKEYS_CNF */
@@ -2079,7 +2079,7 @@
eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
/* 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,
+ QDF_MAC_ADDR_STR,
session->peSessionId,
QDF_MAC_ADDR_ARRAY(session->bssId));
@@ -2319,13 +2319,13 @@
if (LIM_IS_AP_ROLE(session) || LIM_IS_IBSS_ROLE(session)) {
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,
+ "state for MAC address: " QDF_MAC_ADDR_STR,
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,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr));
/* Change timer to reactivate it in future */
lim_deactivate_and_change_per_sta_id_timer(mac_ctx,
@@ -2383,7 +2383,7 @@
* By sending deauth try to clear the session created on peer device.
*/
pe_debug("Sessionid: %d try sending deauth on channel %d to BSSID: "
- MAC_ADDRESS_STR, session->peSessionId,
+ QDF_MAC_ADDR_STR, session->peSessionId,
session->currentOperChannel,
QDF_MAC_ADDR_ARRAY(session->bssId));
lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
@@ -2422,7 +2422,7 @@
}
/* 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,
+ pe_debug("delete pre auth node for "QDF_MAC_ADDR_STR,
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 2b36331..e49303f 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
@@ -996,7 +996,7 @@
deauth_ind->peerMacAddr,
&session_id);
if (!session) {
- pe_err("session does not exist for Addr:" MAC_ADDRESS_STR,
+ pe_err("session does not exist for Addr:" QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(deauth_ind->peerMacAddr));
return;
}
@@ -3144,7 +3144,7 @@
mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr))) {
pe_err("Index %d Sessionid: %d Send deauth on "
- "channel %d to BSSID: "MAC_ADDRESS_STR, apCount,
+ "channel %d to BSSID: "QDF_MAC_ADDR_STR, apCount,
session_entry->peSessionId, session_entry->currentOperChannel,
QDF_MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription.
bssId));
@@ -3187,7 +3187,7 @@
mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId =
session_entry->peSessionId;
pe_debug("Sessionid: %d Send Probe req on channel %d ssid:%.*s "
- "BSSID: " MAC_ADDRESS_STR, session_entry->peSessionId,
+ "BSSID: " QDF_MAC_ADDR_STR, session_entry->peSessionId,
session_entry->currentOperChannel, ssId.length, ssId.ssId,
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 ecac102..2dbe756 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
@@ -283,7 +283,7 @@
if (sir_convert_probe_req_frame2_struct(mac_ctx, body_ptr,
frame_len, &probe_req) == QDF_STATUS_E_FAILURE) {
pe_err("Parse error ProbeReq, length: %d, SA is: "
- MAC_ADDRESS_STR, frame_len,
+ QDF_MAC_ADDR_STR, frame_len,
QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return;
}
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 f6adcd4..5610bbc 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
@@ -127,7 +127,7 @@
header = WMA_GET_RX_MAC_HEADER(rx_Packet_info);
- pe_debug("Rx Probe Response with length = %d from "MAC_ADDRESS_STR,
+ pe_debug("Rx Probe Response with length = %d from "QDF_MAC_ADDR_STR,
WMA_GET_RX_MPDU_LEN(rx_Packet_info),
QDF_MAC_ADDR_ARRAY(header->sa));
@@ -143,7 +143,7 @@
frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info);
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("Probe Resp Frame Received: BSSID "
- MAC_ADDRESS_STR " (RSSI %d)"),
+ QDF_MAC_ADDR_STR " (RSSI %d)"),
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 */
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 43acba5..07aef4f 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
@@ -1025,7 +1025,7 @@
{
session->sae_pmk_cached = sme_join_req->sae_pmk_cached;
- pe_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR,
+ pe_debug("pmk_cached %d for BSSID=" QDF_MAC_ADDR_STR,
session->sae_pmk_cached,
QDF_MAC_ADDR_ARRAY(sme_join_req->bssDescription.bssId));
}
@@ -1296,7 +1296,7 @@
if (session) {
pe_err("Session(%d) Already exists for BSSID: "
- MAC_ADDRESS_STR " in limSmeState = %X",
+ QDF_MAC_ADDR_STR " in limSmeState = %X",
session_id,
QDF_MAC_ADDR_ARRAY(bss_desc->bssId),
session->limSmeState);
@@ -2065,14 +2065,14 @@
&sessionId);
if (!pe_session) {
pe_err("session does not exist for given bssId "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes));
retCode = eSIR_SME_INVALID_PARAMETERS;
disassocTrigger = eLIM_HOST_DISASSOC;
goto sendDisassoc;
}
pe_debug("received DISASSOC_REQ message on sessionid %d Systemrole %d Reason: %u SmeState: %d from: "
- MAC_ADDRESS_STR, smesessionId,
+ QDF_MAC_ADDR_STR, smesessionId,
GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode,
mac->lim.gLimSmeState,
QDF_MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes));
@@ -2336,7 +2336,7 @@
&pe_session->dph.dphHashTable);
if (!sta) {
pe_err("DISASSOC_CNF for a STA with no context, addr= "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes));
status = lim_prepare_disconnect_done_ind(mac, &msg,
pe_session->smeSessionId,
@@ -2353,7 +2353,7 @@
eLIM_MLM_WT_DEL_STA_RSP_STATE) ||
(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",
+ pe_err("No need of cleanup for addr:" QDF_MAC_ADDR_STR "as MLM state is %d",
QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes),
sta->mlmStaContext.mlmState);
status = lim_prepare_disconnect_done_ind(mac, &msg,
@@ -2427,7 +2427,7 @@
goto send_deauth;
}
pe_debug("received DEAUTH_REQ sessionid %d Systemrole %d reasoncode %u limSmestate %d from "
- MAC_ADDRESS_STR, sme_session_id,
+ QDF_MAC_ADDR_STR, sme_session_id,
GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode,
session_entry->limSmeState,
QDF_MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes));
@@ -3333,7 +3333,7 @@
}
pe_debug("Sent DELTS request to station with assocId = %d MacAddr = "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
pDeltsReq->aid, QDF_MAC_ADDR_ARRAY(peerMacAddr));
lim_send_delts_req_action_frame(mac, peerMacAddr,
@@ -4267,12 +4267,12 @@
req->session_id);
if (!session_entry) {
pe_err("session does not exist for given bssId "
- MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(req->peer_mac));
+ QDF_MAC_ADDR_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",
+ QDF_MAC_ADDR_STR " reason->%d wait_for_ack->%d",
req->msg_type, req->length, req->session_id,
QDF_MAC_ADDR_ARRAY(req->peer_mac), req->reason, req->wait_for_ack);
@@ -5379,7 +5379,7 @@
if (!session_entry) {
pe_err("Session not found for given bssid"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes));
goto end;
}
@@ -5470,7 +5470,7 @@
if (!session_entry) {
pe_debug("Session not found for given bssid"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(update_ie->bssid.bytes));
goto end;
}
@@ -5700,7 +5700,7 @@
session_entry = pe_find_session_by_bssid(mac_ctx,
dfs_csa_ie_req->bssid, &session_id);
if (!session_entry) {
- pe_err("Session not found for given BSSID" MAC_ADDRESS_STR,
+ pe_err("Session not found for given BSSID" QDF_MAC_ADDR_STR,
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 6355ae1..9180298 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -423,8 +423,8 @@
(uint8_t *) (addr3), sizeof(tSirMacAddr));
pe_debug("Preparing TDLS frame header to %s A1:"
- MAC_ADDRESS_STR", A2:"MAC_ADDRESS_STR", A3:"
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR", A2:"QDF_MAC_ADDR_STR", A3:"
+ QDF_MAC_ADDR_STR,
(tdlsLinkType == TDLS_LINK_AP) ? "AP" : "DIRECT",
QDF_MAC_ADDR_ARRAY(pMacHdr->addr1),
QDF_MAC_ADDR_ARRAY(pMacHdr->addr2),
@@ -635,7 +635,7 @@
}
#endif
- pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
+ pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR,
SIR_MAC_TDLS_DIS_REQ,
lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_REQ),
QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
@@ -938,7 +938,7 @@
qdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, addIe,
addIeLen);
}
- pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="MAC_ADDRESS_STR,
+ pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="QDF_MAC_ADDR_STR,
SIR_MAC_TDLS_DIS_RSP,
lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_RSP),
QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
@@ -1002,7 +1002,7 @@
} else {
Aid->present = 0;
pe_err("sta is NULL for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(peerMac.bytes));
}
}
@@ -1312,7 +1312,7 @@
addIeLen);
}
- pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
+ pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR,
SIR_MAC_TDLS_SETUP_REQ,
lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_REQ),
QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
@@ -1503,7 +1503,7 @@
padLen - MIN_VENDOR_SPECIFIC_IE_SIZE);
}
#endif
- pe_debug("[TDLS] action: %d (%s) -%s-> OTA peer="MAC_ADDRESS_STR,
+ pe_debug("[TDLS] action: %d (%s) -%s-> OTA peer="QDF_MAC_ADDR_STR,
SIR_MAC_TDLS_TEARDOWN,
lim_trace_tdls_action_string(SIR_MAC_TDLS_TEARDOWN),
((reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP" :
@@ -1764,7 +1764,7 @@
addIeLen);
}
- pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
+ pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR,
SIR_MAC_TDLS_SETUP_RSP,
lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_RSP),
QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
@@ -1971,7 +1971,7 @@
}
#endif
- pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
+ pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR,
SIR_MAC_TDLS_SETUP_CNF,
lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_CNF),
QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
@@ -2554,13 +2554,13 @@
&pe_session->dph.dphHashTable);
if (sta && pAddStaReq->tdls_oper == TDLS_OPER_ADD) {
- pe_err("TDLS entry for peer: "MAC_ADDRESS_STR " already exist, cannot add new entry",
+ pe_err("TDLS entry for peer: "QDF_MAC_ADDR_STR " already exist, cannot add new entry",
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",
+ pe_err("Non TDLS entry for peer: "QDF_MAC_ADDR_STR " already exist",
QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
return QDF_STATUS_E_FAILURE;
}
@@ -2569,7 +2569,7 @@
aid = lim_assign_peer_idx(mac, pe_session);
if (!aid) {
- pe_err("No more free AID for peer: "MAC_ADDRESS_STR,
+ pe_err("No more free AID for peer: "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
return QDF_STATUS_E_FAILURE;
}
@@ -2577,7 +2577,7 @@
/* Set the aid in peerAIDBitmap as it has been assigned to TDLS peer */
SET_PEER_AID_BITMAP(pe_session->peerAIDBitmap, aid);
- pe_debug("Aid: %d, for peer: " MAC_ADDRESS_STR,
+ pe_debug("Aid: %d, for peer: " QDF_MAC_ADDR_STR,
aid, QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
sta =
dph_get_hash_entry(mac, aid,
@@ -2632,7 +2632,7 @@
&pe_session->dph.dphHashTable);
if (sta) {
- pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR,
+ pe_debug("DEL STA peer MAC: "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(sta->staAddr));
pe_debug("STA type: %x, sta idx: %x resp_reqd: %d",
@@ -2642,7 +2642,7 @@
status = lim_del_sta(mac, sta, resp_reqd, pe_session);
} else {
- pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR" not found",
+ pe_debug("DEL STA peer MAC: "QDF_MAC_ADDR_STR" not found",
QDF_MAC_ADDR_ARRAY(peerMac.bytes));
}
@@ -2709,7 +2709,7 @@
uint16_t aid = 0;
SET_LIM_PROCESS_DEFD_MESGS(mac, true);
- pe_debug("staIdx: %d, staMac: "MAC_ADDRESS_STR,
+ pe_debug("staIdx: %d, staMac: "QDF_MAC_ADDR_STR,
pAddStaParams->staIdx,
QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
@@ -3110,7 +3110,7 @@
if (!stads)
goto skip;
- pe_debug("Deleting "MAC_ADDRESS_STR,
+ pe_debug("Deleting "QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(stads->staAddr));
if (!lim_is_roam_synch_in_progress(session_entry)) {
@@ -3125,7 +3125,7 @@
status = lim_tdls_del_sta(p_mac, mac_addr,
session_entry, false);
if (status != QDF_STATUS_SUCCESS)
- pe_debug("peer "MAC_ADDRESS_STR" not found",
+ pe_debug("peer "QDF_MAC_ADDR_STR" not found",
QDF_MAC_ADDR_ARRAY(stads->staAddr));
}
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 9af426b..0193fa2 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -115,7 +115,7 @@
if (!pBssDescr->beaconInterval) {
pe_warn("Beacon Interval is ZERO, making it to default 100 "
- MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->bssId));
+ QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->bssId));
pBssDescr->beaconInterval = 100;
}
/*
@@ -147,7 +147,7 @@
/* SINR no longer reported by HW */
pBssDescr->sinr = 0;
- pe_debug(MAC_ADDRESS_STR " rssi: normalized: %d, absolute: %d",
+ pe_debug(QDF_MAC_ADDR_STR " rssi: normalized: %d, absolute: %d",
QDF_MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi,
pBssDescr->rssi_raw);
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 4fe354c..7e55067 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -2244,7 +2244,7 @@
* status code, 128 bytes for challenge text and
* 4 bytes each for IV & ICV.
*/
- pe_debug("Sending encrypted auth frame to " MAC_ADDRESS_STR,
+ pe_debug("Sending encrypted auth frame to " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(peer_addr));
body_len = wep_challenge_len + LIM_ENCR_AUTH_INFO_LEN;
@@ -2254,7 +2254,7 @@
}
pe_debug("Sending Auth seq# %d status %d (%d) to "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
auth_frame->authTransactionSeqNumber,
auth_frame->authStatusCode,
(auth_frame->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
@@ -2393,7 +2393,7 @@
if (wep_challenge_len) {
qdf_mem_copy(body, (uint8_t *) auth_frame, body_len);
- pe_debug("Sending Auth seq# 3 to " MAC_ADDRESS_STR,
+ pe_debug("Sending Auth seq# 3 to " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac_hdr->da));
} else {
@@ -2480,7 +2480,7 @@
}
pe_debug("*** Sending Auth seq# %d status %d (%d) to "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
auth_frame->authTransactionSeqNumber,
auth_frame->authStatusCode,
(auth_frame->authStatusCode ==
@@ -2890,8 +2890,8 @@
}
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,
+ "reason %u and waitForAck %d to " QDF_MAC_ADDR_STR " ,From "
+ QDF_MAC_ADDR_STR, pe_session->peSessionId, nReason,
waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da),
QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
@@ -3065,8 +3065,8 @@
nStatus);
}
pe_debug("***Sessionid %d Sending Deauth frame with "
- "reason %u and waitForAck %d to " MAC_ADDRESS_STR
- " ,From " MAC_ADDRESS_STR,
+ "reason %u and waitForAck %d to " QDF_MAC_ADDR_STR
+ " ,From " QDF_MAC_ADDR_STR,
pe_session->peSessionId, nReason, waitForAck,
QDF_MAC_ADDR_ARRAY(pMacHdr->da),
QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
@@ -3652,7 +3652,7 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- pe_debug("Send Ext channel Switch to :"MAC_ADDRESS_STR" with swcount %d, swmode %d , newchannel %d newops %d",
+ pe_debug("Send Ext channel Switch to :"QDF_MAC_ADDR_STR" with swcount %d, swmode %d , newchannel %d newops %d",
QDF_MAC_ADDR_ARRAY(mac_hdr->da),
frm.ext_chan_switch_ann_action.switch_count,
frm.ext_chan_switch_ann_action.switch_mode,
@@ -3806,7 +3806,7 @@
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
pe_debug("Send frame on channel %d to mac "
- MAC_ADDRESS_STR, session_entry->currentOperChannel,
+ QDF_MAC_ADDR_STR, session_entry->currentOperChannel,
QDF_MAC_ADDR_ARRAY(peer));
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
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 4c91a72..3776910 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
@@ -658,7 +658,7 @@
* Duplicate entry is removed at LIM.
* Initiate new entry for other session
*/
- pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " MAC_ADDRESS_STR,
+ pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(peerMacAddr));
for (i = 0; i < mac->lim.maxBssId; i++) {
@@ -705,7 +705,7 @@
goto error;
}
pe_debug("send eWNI_SME_DISASSOC_RSP with retCode: %d for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP;
pSirSmeDisassocRsp->length = sizeof(struct disassoc_rsp);
@@ -746,7 +746,7 @@
goto error;
}
pe_debug("send eWNI_SME_DISASSOC_IND with retCode: %d for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND;
pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
@@ -918,7 +918,7 @@
{
struct tdls_event_info info;
- pe_debug("Delete TDLS Peer "MAC_ADDRESS_STR "with reason code: %d",
+ pe_debug("Delete TDLS Peer "QDF_MAC_ADDR_STR "with reason code: %d",
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);
@@ -1045,7 +1045,7 @@
if (!pSirSmeDeauthRsp)
return;
pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp);
@@ -1083,7 +1083,7 @@
if (!pSirSmeDeauthInd)
return;
pe_debug("send eWNI_SME_DEAUTH_IND with retCode: %d for "
- MAC_ADDRESS_STR,
+ QDF_MAC_ADDR_STR,
reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDeauthInd->messageType = eWNI_SME_DEAUTH_IND;
pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd);
@@ -1960,7 +1960,7 @@
pSmeMaxAssocInd->sessionId = smesessionId;
mmhMsg.type = pSmeMaxAssocInd->mesgType;
mmhMsg.bodyptr = pSmeMaxAssocInd;
- pe_debug("msgType: %s peerMacAddr "MAC_ADDRESS_STR "sme session id %d",
+ pe_debug("msgType: %s peerMacAddr "QDF_MAC_ADDR_STR "sme session id %d",
"eWNI_SME_MAX_ASSOC_EXCEEDED", QDF_MAC_ADDR_ARRAY(peerMacAddr),
pSmeMaxAssocInd->sessionId);
MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 4976c54..35d594e 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -442,7 +442,7 @@
if (eSIR_INFRASTRUCTURE_MODE == bss_type) {
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,
+ pe_debug("Set filter for STA Session %d bssid "QDF_MAC_ADDR_STR,
session_id, QDF_MAC_ADDR_ARRAY(*bssid));
} else if (eSIR_IBSS_MODE == bss_type) {
if (!ibss_ssid) {
@@ -639,7 +639,7 @@
session_ptr->is_session_obss_color_collision_det_enabled =
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",
+ pe_debug("Create a new PE session: %d BSSID: "QDF_MAC_ADDR_STR" Max No of STA: %d",
*sessionId, QDF_MAC_ADDR_ARRAY(bssid), numSta);
if (eSIR_INFRA_AP_MODE == bssType || eSIR_IBSS_MODE == bssType) {
@@ -876,7 +876,7 @@
return;
}
- pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "MAC_ADDRESS_STR,
+ pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "QDF_MAC_ADDR_STR,
session->peSessionId, session->operMode,
session->bssIdx,
QDF_MAC_ADDR_ARRAY(session->bssId));
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 7c93765..ace152a 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_print_mac_addr(struct mac_context *mac, tSirMacAddr macAddr, uint8_t logLevel)
{
- pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macAddr));
+ pe_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(macAddr));
} /****** end lim_print_mac_addr() ******/
/*
@@ -6612,7 +6612,7 @@
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",
+ pe_err("Duplicate frame from "QDF_MAC_ADDR_STR " Seq Number %d",
QDF_MAC_ADDR_ARRAY(pHdr->sa), seq_num);
return false;
}
@@ -7586,7 +7586,7 @@
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("session %d exists with mac address "
- MAC_ADDRESS_STR), session->sessionId,
+ QDF_MAC_ADDR_STR), session->sessionId,
QDF_MAC_ADDR_ARRAY(self_mac));
return session;