summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnson <jjohnson@codeaurora.org>2017-09-18 08:01:50 -0700
committersnandini <snandini@codeaurora.org>2017-09-18 23:58:28 -0700
commit5abbcd1ae8a8156772f9ab694a31ea1b4b8d0313 (patch)
tree627d63e64f393476ea809ff5d513f5560f9c423b
parente3a8f494796e02605242805857ca54b7978e65b9 (diff)
qcacld-3.0: mac: Replace instances of unadorned %p
Replace instances of unadorned %p in core/mac. Change-Id: Id9b15d369dda7660f292e6c961b25d2e8270b141 CRs-Fixed: 2100997
-rw-r--r--core/mac/src/pe/lim/lim_admit_control.c2
-rw-r--r--core/mac/src/pe/lim/lim_api.c2
-rw-r--r--core/mac/src/pe/lim/lim_ft.c2
-rw-r--r--core/mac/src/pe/lim/lim_ft_preauth.c16
-rw-r--r--core/mac/src/pe/lim/lim_link_monitoring_algo.c2
-rw-r--r--core/mac/src/pe/lim/lim_p2p.c2
-rw-r--r--core/mac/src/pe/lim/lim_process_auth_frame.c12
-rw-r--r--core/mac/src/pe/lim/lim_process_fils.c4
-rw-r--r--core/mac/src/pe/lim/lim_process_mlm_host_roam.c2
-rw-r--r--core/mac/src/pe/lim/lim_process_sme_req_messages.c2
-rw-r--r--core/mac/src/pe/lim/lim_security_utils.c4
-rw-r--r--core/mac/src/pe/lim/lim_send_management_frames.c4
-rw-r--r--core/mac/src/pe/lim/lim_send_sme_rsp_messages.c2
-rw-r--r--core/mac/src/pe/lim/lim_utils.c4
14 files changed, 30 insertions, 30 deletions
diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c
index 1572a4322f54..9c6457c29e69 100644
--- a/core/mac/src/pe/lim/lim_admit_control.c
+++ b/core/mac/src/pe/lim/lim_admit_control.c
@@ -391,7 +391,7 @@ static void lim_tspec_delete(tpAniSirGlobal pMac, tpLimTspecInfo pInfo)
if (pInfo == NULL)
return;
/* pierre */
- pe_debug("tspec entry: %d delete tspec: %p", pInfo->idx, pInfo);
+ pe_debug("tspec entry: %d delete tspec: %pK", pInfo->idx, pInfo);
pInfo->inuse = 0;
return;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index e5c9bde5fb3c..fbacfb4d44de 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1110,7 +1110,7 @@ static QDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff)
mHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
if (mHdr->fc.type == SIR_MAC_MGMT_FRAME) {
- pe_debug("RxBd: %p mHdr: %p Type: %d Subtype: %d SizesFC: %zu Mgmt: %zu",
+ pe_debug("RxBd: %pK mHdr: %pK Type: %d Subtype: %d SizesFC: %zu Mgmt: %zu",
pRxPacketInfo, mHdr, mHdr->fc.type, mHdr->fc.subType,
sizeof(tSirMacFrameCtl), sizeof(tSirMacMgmtHdr));
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 8d43b67744ac..66c679fa9058 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -91,7 +91,7 @@ void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry)
}
if (NULL != psessionEntry->ftPEContext.pFTPreAuthReq) {
- pe_debug("Freeing pFTPreAuthReq: %p",
+ pe_debug("Freeing pFTPreAuthReq: %pK",
psessionEntry->ftPEContext.pFTPreAuthReq);
if (NULL !=
psessionEntry->ftPEContext.pFTPreAuthReq->
diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c
index 08fc414c3f08..61b4c34c9d1e 100644
--- a/core/mac/src/pe/lim/lim_ft_preauth.c
+++ b/core/mac/src/pe/lim/lim_ft_preauth.c
@@ -69,7 +69,7 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac,
pFTPreAuthReq->preAuthbssId,
&sessionId);
- pe_debug("Freeing pFTPreAuthReq= %p",
+ pe_debug("Freeing pFTPreAuthReq= %pK",
psessionEntry->ftPEContext.pFTPreAuthReq);
if (psessionEntry->ftPEContext.pFTPreAuthReq->
pbssDescription) {
@@ -196,12 +196,12 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)
|| lim_is_in_mcc(mac_ctx)) {
/* Need to suspend link only if the channels are different */
- pe_debug("Performing pre-auth on diff channel(session %p)",
+ pe_debug("Performing pre-auth on diff channel(session %pK)",
session);
lim_send_preauth_scan_offload(mac_ctx, session->peSessionId,
session->ftPEContext.pFTPreAuthReq);
} else {
- pe_debug("Performing pre-auth on same channel (session %p)",
+ pe_debug("Performing pre-auth on same channel (session %pK)",
session);
/* We are in the same channel. Perform pre-auth */
lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL,
@@ -259,7 +259,7 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status,
pe_err("psessionEntry is not in STA mode");
return;
}
- pe_debug("Entered wait auth2 state for FT (old session %p)",
+ pe_debug("Entered wait auth2 state for FT (old session %pK)",
psessionEntry);
if (psessionEntry->is11Rconnection) {
/* Now we are on the right channel and need to send out Auth1
@@ -475,7 +475,7 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status,
else
pftSessionEntry->vdev_nss = pMac->vdev_type_nss_2g.sta;
- pe_debug("created session (%p) with id = %d",
+ pe_debug("created session (%pK) with id = %d",
pftSessionEntry, pftSessionEntry->peSessionId);
/* Update the ReAssoc BSSID of the current session */
@@ -546,7 +546,7 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
*/
if (true ==
session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed) {
- pe_err("Auth rsp already posted to SME (session %p)",
+ pe_err("Auth rsp already posted to SME (session %pK)",
session);
return;
} else {
@@ -558,7 +558,7 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
* Preauth rsp processed so that any rsp from AP is dropped in
* lim_process_auth_frame_no_session.
*/
- pe_debug("Auth rsp not yet posted to SME (session %p)",
+ pe_debug("Auth rsp not yet posted to SME (session %pK)",
session);
session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed = true;
}
@@ -600,7 +600,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
return;
}
- pe_debug("Auth Rsp = %p", ft_pre_auth_rsp);
+ pe_debug("Auth Rsp = %pK", ft_pre_auth_rsp);
if (session) {
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(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 b19fffd2a9b3..b5ef75421e8a 100644
--- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c
+++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c
@@ -298,7 +298,7 @@ lim_trigger_sta_deletion(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
eLIM_MLM_WT_DEL_BSS_RSP_STATE) ||
sta_ds->sta_deletion_in_progress) {
/* Already in the process of deleting context for the peer */
- pe_debug("Deletion is in progress (%d) for peer:%p in mlmState %d",
+ pe_debug("Deletion is in progress (%d) for peer:%pK in mlmState %d",
sta_ds->sta_deletion_in_progress, sta_ds->staAddr,
sta_ds->mlmStaContext.mlmState);
return;
diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c
index e95ca1727f48..206d13103da1 100644
--- a/core/mac/src/pe/lim/lim_p2p.c
+++ b/core/mac/src/pe/lim/lim_p2p.c
@@ -681,7 +681,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx,
p2p_ie[1] += noa_len;
}
msg_len += noa_len;
- pe_debug("noa_len: %d orig_len: %d p2p_ie: %p msg_len: %d nBytesToCopy: %zu ",
+ pe_debug("noa_len: %d orig_len: %d p2p_ie: %pK msg_len: %d nBytesToCopy: %zu ",
noa_len, orig_len, p2p_ie, msg_len,
((p2p_ie + orig_len + 2) -
(uint8_t *) mb_msg->data));
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 5d6268e96657..fb23d8e08a21 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -165,7 +165,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx,
auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
- pe_debug("Alloc new data: %p id: %d peer ",
+ pe_debug("Alloc new data: %pK id: %d peer ",
auth_node, auth_node->authNodeIdx);
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
/* / Create and activate Auth Response timer */
@@ -240,7 +240,7 @@ static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx,
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGW);
return;
}
- pe_debug("Alloc new data: %p peer", auth_node);
+ pe_debug("Alloc new data: %pK peer", auth_node);
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
qdf_mem_copy((uint8_t *) auth_node->peerMacAddr,
mac_hdr->sa, sizeof(tSirMacAddr));
@@ -634,7 +634,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx,
return;
}
- pe_debug("Alloc new data: %p peer", auth_node);
+ pe_debug("Alloc new data: %pK peer", auth_node);
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
qdf_mem_copy((uint8_t *) auth_node->peerMacAddr,
mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr,
@@ -990,7 +990,7 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx,
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGW);
return;
}
- pe_debug("Alloc new data: %p peer", auth_node);
+ pe_debug("Alloc new data: %pK peer", auth_node);
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
qdf_mem_copy((uint8_t *) auth_node->peerMacAddr,
mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr,
@@ -1536,12 +1536,12 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
* pre-auth.
*/
pe_debug("Auth rsp already posted to SME"
- " (session %p, FT session %p)", psessionEntry,
+ " (session %pK, FT session %pK)", psessionEntry,
psessionEntry);
return eSIR_SUCCESS;
} else {
pe_warn("Auth rsp not yet posted to SME"
- " (session %p, FT session %p)", psessionEntry,
+ " (session %pK, FT session %pK)", psessionEntry,
psessionEntry);
psessionEntry->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed =
true;
diff --git a/core/mac/src/pe/lim/lim_process_fils.c b/core/mac/src/pe/lim/lim_process_fils.c
index 3977a32f69b1..8ea979c08846 100644
--- a/core/mac/src/pe/lim/lim_process_fils.c
+++ b/core/mac/src/pe/lim/lim_process_fils.c
@@ -1548,7 +1548,7 @@ static int fils_aead_encrypt(const u8 *kek, unsigned int kek_len,
anonce == NULL || data_len == 0 || plain_text_len == 0 ||
out == NULL) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
- FL("Error missing params mac:%p bssid:%p snonce:%p anonce:%p data_len:%zu plain_text_len:%zu out:%p"),
+ FL("Error missing params mac:%pK bssid:%pK snonce:%pK anonce:%pK data_len:%zu plain_text_len:%zu out:%pK"),
own_mac, bssid, snonce, anonce, data_len,
plain_text_len, out);
return -EINVAL;
@@ -1703,7 +1703,7 @@ static int fils_aead_decrypt(const u8 *kek, unsigned int kek_len,
anonce == NULL || data_len == 0 || ciphered_text_len == 0 ||
plain_text == NULL) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
- FL("Error missing params mac:%p bssid:%p snonce:%p anonce:%p data_len:%zu ciphered_text_len:%zu plain_text:%p"),
+ FL("Error missing params mac:%pK bssid:%pK snonce:%pK anonce:%pK data_len:%zu ciphered_text_len:%zu plain_text:%pK"),
own_mac, bssid, snonce, anonce, data_len,
ciphered_text_len, plain_text);
return -EINVAL;
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 12be40c04bdd..b7c637324acc 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
@@ -273,7 +273,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
* HT params.
*/
if (session->ftPEContext.pFTPreAuthReq) {
- pe_debug("Freeing pFTPreAuthReq: %p",
+ pe_debug("Freeing pFTPreAuthReq: %pK",
session->ftPEContext.pFTPreAuthReq);
if (session->ftPEContext.pFTPreAuthReq->pbssDescription) {
qdf_mem_free(
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 4a9f3e470f31..9fb572d1570a 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
@@ -5657,7 +5657,7 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx,
if ((0 == modify_add_ies->modifyIE.ieBufferlength) ||
(0 == modify_add_ies->modifyIE.ieIDLen) ||
(NULL == modify_add_ies->modifyIE.pIEBuffer)) {
- pe_err("Invalid request pIEBuffer %p ieBufferlength %d ieIDLen %d ieID %d. update Type %d",
+ pe_err("Invalid request pIEBuffer %pK ieBufferlength %d ieIDLen %d ieID %d. update Type %d",
modify_add_ies->modifyIE.pIEBuffer,
modify_add_ies->modifyIE.ieBufferlength,
modify_add_ies->modifyIE.ieID,
diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c
index 14342b2cb955..443a10aa8fbf 100644
--- a/core/mac/src/pe/lim/lim_security_utils.c
+++ b/core/mac/src/pe/lim/lim_security_utils.c
@@ -375,7 +375,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
pMac->lim.pLimPreAuthList = pTempNode->next;
- pe_debug("first node to delete, Release data entry: %p id %d peer",
+ pe_debug("first node to delete, Release data entry: %pK id %d peer",
pTempNode, pTempNode->authNodeIdx);
lim_print_mac_addr(pMac, macAddr, LOGD);
lim_release_pre_auth_node(pMac, pTempNode);
@@ -393,7 +393,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
pPrevNode->next = pTempNode->next;
- pe_debug("subsequent node to delete, Release data entry: %p id %d peer",
+ pe_debug("subsequent node to delete, Release data entry: %pK id %d peer",
pTempNode, pTempNode->authNodeIdx);
lim_print_mac_addr(pMac, macAddr, LOGD);
lim_release_pre_auth_node(pMac, pTempNode);
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 0f6d11db31a9..4a73e4083e19 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -2457,7 +2457,7 @@ QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac)
#endif
(psessionEntry->isFastRoamIniFeatureEnabled) ||
(psessionEntry->is11Rconnection))) {
- pe_debug("FT Preauth (%p,%d) Deauth rc %d src = %d",
+ pe_debug("FT Preauth (%pK,%d) Deauth rc %d src = %d",
psessionEntry,
psessionEntry->peSessionId,
pMlmDeauthReq->reasonCode,
@@ -2554,7 +2554,7 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
if (LIM_IS_STA_ROLE(pe_session) &&
(disassoc_req->reasonCode !=
eSIR_MAC_DISASSOC_DUE_TO_FTHANDOFF_REASON)) {
- pe_debug("FT Preauth Session (%p,%d) Clean up"
+ pe_debug("FT Preauth Session (%pK,%d) Clean up"
#ifdef FEATURE_WLAN_ESE
" isESE %d"
#endif
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 9c80f0c87eb2..616504648000 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
@@ -362,7 +362,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
ht_profile->apChanWidth = session_entry->ch_width;
}
#endif
- pe_debug("pLimJoinReq:%p, pLimReAssocReq:%p",
+ pe_debug("pLimJoinReq:%pK, pLimReAssocReq:%pK",
session_entry->pLimJoinReq,
session_entry->pLimReAssocReq);
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index dab97526ee2c..1022d68b0570 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -6170,7 +6170,7 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry,
populate_dot11f_ht_caps(p_mac, p_session_entry, &dot11_ht_cap);
p_ie = lim_get_ie_ptr_new(p_mac, p_ie_start, num_bytes,
DOT11F_EID_HTCAPS, ONE_BYTE);
- pe_debug("p_ie: %p dot11_ht_cap.supportedMCSSet[0]: 0x%x",
+ pe_debug("p_ie: %pK dot11_ht_cap.supportedMCSSet[0]: 0x%x",
p_ie, dot11_ht_cap.supportedMCSSet[0]);
if (p_ie) {
/* convert from unpacked to packed structure */
@@ -7337,7 +7337,7 @@ QDF_STATUS lim_util_get_type_subtype(void *pkt, uint8_t *type,
hdr = WMA_GET_RX_MAC_HEADER(rxpktinfor);
if (hdr->fc.type == SIR_MAC_MGMT_FRAME) {
- pe_debug("RxBd: %p mHdr: %p Type: %d Subtype: %d SizesFC: %zu",
+ pe_debug("RxBd: %pK mHdr: %pK Type: %d Subtype: %d SizesFC: %zu",
rxpktinfor, hdr, hdr->fc.type, hdr->fc.subType,
sizeof(tSirMacFrameCtl));
*type = hdr->fc.type;