From 28fb0123722ef9532854c7c044a0356f35cd20db Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Sun, 26 Mar 2017 22:21:20 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete file lim_debug.c Replace lim_log() with pe_* log levels and Remove lim_log() and obsolete file lim_debug.c. Change-Id: I6b39737890d186adb6f0cdcb4a116863e328b07e CRs-Fixed: 1093093 --- core/mac/src/pe/include/lim_api.h | 2 - core/mac/src/pe/lim/lim_api.c | 32 +++--------- core/mac/src/pe/lim/lim_debug.c | 49 ------------------- .../mac/src/pe/lim/lim_process_action_frame.c | 32 ++++++------ .../src/pe/lim/lim_process_sme_req_messages.c | 16 +++--- core/mac/src/pe/lim/lim_process_tdls.c | 5 +- .../src/pe/lim/lim_send_frames_host_roam.c | 4 +- .../src/pe/lim/lim_send_management_frames.c | 31 ++++++------ core/mac/src/pe/nan/nan_datapath.c | 4 +- .../src/sys/legacy/src/utils/src/parser_api.c | 20 ++++---- 10 files changed, 57 insertions(+), 138 deletions(-) delete mode 100644 core/mac/src/pe/lim/lim_debug.c diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h index df37c4d05d..c20a7608f3 100644 --- a/core/mac/src/pe/include/lim_api.h +++ b/core/mac/src/pe/include/lim_api.h @@ -379,8 +379,6 @@ QDF_STATUS lim_update_ext_cap_ie(tpAniSirGlobal mac_ctx, LIM_HE_MU_BEAMFORMER_BIT_POS) #endif -void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, - const char *pString, ...); QDF_STATUS lim_add_qcn_ie(tpAniSirGlobal mac_ctx, uint8_t *ie_data, uint16_t *ie_len); /************************************************************/ diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index f2449a0ec1..56a3bb3b4c 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1031,8 +1031,7 @@ static QDF_STATUS pe_drop_pending_rx_mgmt_frames(tpAniSirGlobal mac_ctx, if (mac_ctx->sys.sys_bbt_pending_mgmt_count >= MGMT_RX_PACKETS_THRESHOLD) { qdf_spin_unlock(&mac_ctx->sys.bbt_mgmt_lock); - lim_log(mac_ctx, LOG1, - FL("No.of pending RX management frames reaches to threshold, dropping management frames")); + pe_debug("No.of pending RX management frames reaches to threshold, dropping management frames"); cds_pkt_return_packet(cds_pkt); cds_pkt = NULL; mac_ctx->rx_packet_drop_counter++; @@ -1045,8 +1044,7 @@ static QDF_STATUS pe_drop_pending_rx_mgmt_frames(tpAniSirGlobal mac_ctx, hdr->fc.subType == SIR_MAC_MGMT_PROBE_RSP) { qdf_spin_unlock(&mac_ctx->sys.bbt_mgmt_lock); if (!(mac_ctx->rx_packet_drop_counter % 100)) - lim_log(mac_ctx, LOG1, - FL("No.of pending RX mgmt frames reaches 1/2 thresh, dropping frame subtype: %d rx_packet_drop_counter: %d"), + pe_debug("No.of pending RX mgmt frames reaches 1/2 thresh, dropping frame subtype: %d rx_packet_drop_counter: %d", hdr->fc.subType, mac_ctx->rx_packet_drop_counter); mac_ctx->rx_packet_drop_counter++; @@ -1060,8 +1058,7 @@ static QDF_STATUS pe_drop_pending_rx_mgmt_frames(tpAniSirGlobal mac_ctx, if (mac_ctx->sys.sys_bbt_pending_mgmt_count == (MGMT_RX_PACKETS_THRESHOLD / 4)) { if (!(mac_ctx->rx_packet_drop_counter % 100)) - lim_log(mac_ctx, LOG1, - FL("No.of pending RX management frames reaches to 1/4th of threshold, rx_packet_drop_counter: %d"), + pe_debug("No.of pending RX management frames reaches to 1/4th of threshold, rx_packet_drop_counter: %d", mac_ctx->rx_packet_drop_counter); mac_ctx->rx_packet_drop_counter++; } @@ -1104,16 +1101,14 @@ static QDF_STATUS pe_handle_mgmt_frame(struct wlan_objmgr_psoc *psoc, pVosPkt = qdf_mem_malloc(sizeof(*pVosPkt)); if (!pVosPkt) { - lim_log(pMac, LOGP, - FL("Failed to allocate rx packet")); + pe_err("Failed to allocate rx packet"); qdf_nbuf_free(buf); return QDF_STATUS_E_NOMEM; } ret = wma_form_rx_packet(buf, mgmt_rx_params, pVosPkt); if (ret) { - lim_log(pMac, LOGP, - FL("Failed to fill cds packet from event buffer")); + pe_err("Failed to fill cds packet from event buffer"); return QDF_STATUS_E_FAILURE; } @@ -1189,8 +1184,7 @@ void pe_register_mgmt_rx_frm_callback(tpAniSirGlobal mac_ctx) status = wlan_mgmt_txrx_register_rx_cb(mac_ctx->psoc, WLAN_UMAC_COMP_MLME, &frm_cb_info, 1); if (status != QDF_STATUS_SUCCESS) - lim_log(mac_ctx, LOGP, - FL("Registering the PE Handle with MGMT TXRX layer has failed")); + pe_err("Registering the PE Handle with MGMT TXRX layer has failed"); wma_register_mgmt_frm_client(); } @@ -1207,8 +1201,7 @@ void pe_deregister_mgmt_rx_frm_callback(tpAniSirGlobal mac_ctx) status = wlan_mgmt_txrx_deregister_rx_cb(mac_ctx->psoc, WLAN_UMAC_COMP_MLME, &frm_cb_info, 1); if (status != QDF_STATUS_SUCCESS) - lim_log(mac_ctx, LOGP, - FL("Deregistering the PE Handle with MGMT TXRX layer has failed")); + pe_err("Deregistering the PE Handle with MGMT TXRX layer has failed"); wma_de_register_mgmt_frm_client(); } @@ -2442,17 +2435,6 @@ QDF_STATUS lim_update_ext_cap_ie(tpAniSirGlobal mac_ctx, return QDF_STATUS_SUCCESS; } -void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) -{ -#ifdef WLAN_DEBUG - va_list marker; - - va_start(marker, pString); - log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker); - va_end(marker); -#endif -} - /** * lim_add_qcn_ie() - Add QCN IE to a given IE buffer * diff --git a/core/mac/src/pe/lim/lim_debug.c b/core/mac/src/pe/lim/lim_debug.c deleted file mode 100644 index 665267c4c7..0000000000 --- a/core/mac/src/pe/lim/lim_debug.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2014, 2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/**========================================================================= - - \file lim_debug.c - - \brief implementation for log Debug related APIs - - \author Sunit Bhatia - - ========================================================================*/ - -#include "lim_debug.h" - -void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) -{ -#ifdef WLAN_DEBUG - va_list marker; - - va_start(marker, pString); - log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker); - va_end(marker); -#endif -} diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index ed3b988f02..069b508da2 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -1644,7 +1644,7 @@ static void lim_process_addba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - lim_log(mac_ctx, LOGE, FL("pdev is NULL")); + pe_err("pdev is NULL"); return; } @@ -1657,7 +1657,7 @@ static void lim_process_addba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, addba_req = qdf_mem_malloc(sizeof(*addba_req)); if (NULL == addba_req) { - lim_log(mac_ctx, LOGE, FL("memory allocation failed")); + pe_err("memory allocation failed"); return; } @@ -1666,19 +1666,17 @@ static void lim_process_addba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, addba_req, false); if (DOT11F_FAILED(status)) { - lim_log(mac_ctx, LOGE, - FL("Failed to unpack and parse (0x%08x, %d bytes)"), + pe_err("Failed to unpack and parse (0x%08x, %d bytes)", status, frame_len); goto error; } else if (DOT11F_WARNED(status)) { - lim_log(mac_ctx, LOGW, - FL("warning: unpack addba Req(0x%08x, %d bytes)"), + pe_warn("warning: unpack addba Req(0x%08x, %d bytes)", status, frame_len); } peer = cdp_peer_find_by_addr(soc, pdev, mac_hdr->sa, &peer_id); if (!peer) { - lim_log(mac_ctx, LOGE, FL("PEER [%pM] not found"), mac_hdr->sa); + pe_err("PEER [%pM] not found", mac_hdr->sa); goto error; } @@ -1693,7 +1691,7 @@ static void lim_process_addba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, lim_send_addba_response_frame(mac_ctx, mac_hdr->sa, addba_req->addba_param_set.tid, session); } else { - lim_log(mac_ctx, LOGE, FL("Failed to process addba request")); + pe_err("Failed to process addba request"); } error: @@ -1725,7 +1723,7 @@ static void lim_process_delba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - lim_log(mac_ctx, LOGE, FL("pdev is NULL")); + pe_err("pdev is NULL"); return; } @@ -1738,7 +1736,7 @@ static void lim_process_delba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, delba_req = qdf_mem_malloc(sizeof(*delba_req)); if (NULL == delba_req) { - lim_log(mac_ctx, LOGE, FL("memory allocation failed")); + pe_err("memory allocation failed"); return; } @@ -1747,19 +1745,17 @@ static void lim_process_delba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, delba_req, false); if (DOT11F_FAILED(status)) { - lim_log(mac_ctx, LOGE, - FL("Failed to unpack and parse (0x%08x, %d bytes)"), + pe_err("Failed to unpack and parse (0x%08x, %d bytes)", status, frame_len); goto error; } else if (DOT11F_WARNED(status)) { - lim_log(mac_ctx, LOGW, - FL("warning: unpack addba Req(0x%08x, %d bytes)"), + pe_warn("warning: unpack addba Req(0x%08x, %d bytes)", status, frame_len); } peer = cdp_peer_find_by_addr(soc, pdev, mac_hdr->sa, &peer_id); if (!peer) { - lim_log(mac_ctx, LOGE, FL("PEER [%pM] not found"), mac_hdr->sa); + pe_err("PEER [%pM] not found", mac_hdr->sa); goto error; } @@ -1767,7 +1763,7 @@ static void lim_process_delba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, delba_req->delba_param_set.tid, delba_req->Reason.code); if (QDF_STATUS_SUCCESS != qdf_status) - lim_log(mac_ctx, LOGE, FL("Failed to process delba request")); + pe_err("Failed to process delba request"); error: qdf_mem_free(delba_req); @@ -2217,7 +2213,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, } break; case SIR_MAC_ACTION_BLKACK: - lim_log(mac_ctx, LOG1, FL("Rcvd Block Ack for %pM; action: %d"), + pe_debug("Rcvd Block Ack for %pM; action: %d", session->selfMacAddr, action_hdr->actionID); switch (action_hdr->actionID) { case SIR_MAC_ADDBA_REQ: @@ -2227,7 +2223,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, lim_process_delba_req(mac_ctx, rx_pkt_info, session); break; default: - lim_log(mac_ctx, LOGE, FL("Unhandle BA action frame")); + pe_err("Unhandle BA action frame"); break; } break; 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 06d6b4b6da..9ec6ec91c5 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 @@ -781,7 +781,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - lim_log(mac_ctx, LOG1, FL("HT[%d], VHT[%d]"), + pe_debug("HT[%d], VHT[%d]", session->htCapability, session->vhtCapability); if (IS_DOT11_MODE_HE(session->dot11mode)) { @@ -4022,7 +4022,7 @@ static void lim_handle_update_ssid_hidden(tpAniSirGlobal mac_ctx, if (ssid_hidden != session->ssidHidden) session->ssidHidden = ssid_hidden; else { - lim_log(mac_ctx, LOG1, FL("Same config already present!")); + pe_debug("Same config already present!"); return; } @@ -5024,27 +5024,23 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, case eWNI_SME_ASSOC_CNF: if (pMsg->type == eWNI_SME_ASSOC_CNF) - PELOG1(lim_log(pMac, - LOG1, FL("Received ASSOC_CNF message"));) + pe_debug("Received ASSOC_CNF message"); __lim_process_sme_assoc_cnf_new(pMac, pMsg->type, pMsgBuf); break; case eWNI_SME_ADDTS_REQ: - PELOG1(lim_log(pMac, LOG1, FL("Received ADDTS_REQ message"));) + pe_debug("Received ADDTS_REQ message"); __lim_process_sme_addts_req(pMac, pMsgBuf); break; case eWNI_SME_DELTS_REQ: - PELOG1(lim_log(pMac, LOG1, FL("Received DELTS_REQ message"));) + pe_debug("Received DELTS_REQ message"); __lim_process_sme_delts_req(pMac, pMsgBuf); break; case SIR_LIM_ADDTS_RSP_TIMEOUT: - PELOG1(lim_log - (pMac, LOG1, - FL("Received SIR_LIM_ADDTS_RSP_TIMEOUT message ")); - ) + pe_debug("Received SIR_LIM_ADDTS_RSP_TIMEOUT message"); lim_process_sme_addts_rsp_timeout(pMac, pMsg->bodyval); break; diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 513d8685bc..92a0c11c0b 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -2762,7 +2762,7 @@ lim_send_tdls_comp_mgmt_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, struct scheduler_msg msg = {0}; tSirSmeRsp *sme_rsp; - lim_log(mac_ctx, LOG1, FL("Sending message %s with reasonCode %s"), + pe_debug("Sending message %s with reasonCode %s", lim_msg_str(msg_type), lim_result_code_str(result_code)); sme_rsp = qdf_mem_malloc(sizeof(tSirSmeRsp)); @@ -3292,8 +3292,7 @@ static void lim_check_aid_and_delete_peer(tpAniSirGlobal p_mac, if (NULL == stads) goto skip; - lim_log(p_mac, LOG1, - FL("Deleting "MAC_ADDRESS_STR), + pe_debug("Deleting "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(stads->staAddr)); lim_send_deauth_mgmt_frame(p_mac, diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c index 16b28a04e1..b3d109d9e0 100644 --- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c +++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c @@ -314,7 +314,7 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, } if (lim_is_session_he_capable(pe_session)) { - lim_log(mac_ctx, LOG1, FL("Populate HE IEs")); + pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pe_session, &frm.vendor_he_cap); } @@ -687,7 +687,7 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, populate_dot11f_ext_cap(pMac, isVHTEnabled, &frm.ExtCap, psessionEntry); if (lim_is_session_he_capable(psessionEntry)) { - lim_log(pMac, LOG1, FL("Populate HE IEs")); + pe_debug("Populate HE IEs"); populate_dot11f_he_caps(pMac, psessionEntry, &frm.vendor_he_cap); } 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 d1ef252c80..0c2b4c15c4 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -353,7 +353,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, if (IS_DOT11_MODE_HE(dot11mode) && NULL != pesession) lim_update_session_he_capable(mac_ctx, pesession); - lim_log(mac_ctx, LOG1, FL("Populate HE IEs")); + pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pesession, &pr.vendor_he_cap); if (addn_ielen) { @@ -685,7 +685,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, } if (lim_is_session_he_capable(pe_session)) { - lim_log(mac_ctx, LOG1, FL("Populate HE IEs")); + pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pe_session, &frm->vendor_he_cap); populate_dot11f_he_operation(mac_ctx, pe_session, @@ -1263,7 +1263,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, if (lim_is_sta_he_capable(sta) && lim_is_session_he_capable(pe_session)) { - lim_log(mac_ctx, LOG1, FL("Populate HE IEs")); + pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pe_session, &frm.vendor_he_cap); populate_dot11f_he_operation(mac_ctx, pe_session, @@ -1835,7 +1835,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, populate_dot11f_qcn_ie(&frm->QCN_IE); if (lim_is_session_he_capable(pe_session)) { - lim_log(mac_ctx, LOG1, FL("Populate HE IEs")); + pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pe_session, &frm->vendor_he_cap); } @@ -4565,13 +4565,13 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - lim_log(mac_ctx, LOGE, FL("pdev is NULL")); + pe_err("pdev is NULL"); return QDF_STATUS_E_FAILURE; } peer = cdp_peer_find_by_addr(soc, pdev, peer_mac, &peer_id); if (!peer) { - lim_log(mac_ctx, LOGE, FL("PEER [%pM] not found"), peer_mac); + pe_err("PEER [%pM] not found", peer_mac); return QDF_STATUS_E_FAILURE; } @@ -4590,28 +4590,28 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, frm.addba_param_set.policy = SIR_MAC_BA_AMSDU_SUPPORTED; frm.ba_timeout.timeout = batimeout; - lim_log(mac_ctx, LOG1, FL("Sending a ADDBA Response from %pM to %pM"), + pe_debug("Sending a ADDBA Response from %pM to %pM", session->selfMacAddr, peer_mac); - lim_log(mac_ctx, LOG1, FL("tid: %d, dialog_token: %d, status: %d, buff_size: %d"), + pe_debug("tid: %d, dialog_token: %d, status: %d, buff_size: %d", tid, frm.DialogToken.token, frm.Status.status, frm.addba_param_set.buff_size); status = dot11f_get_packed_addba_rsp_size(mac_ctx, &frm, &payload_size); if (DOT11F_FAILED(status)) { - lim_log(mac_ctx, LOGP, FL("Failed to calculate the packed size for a ADDBA Response (0x%08x)."), + pe_err("Failed to calculate the packed size for a ADDBA Response (0x%08x).", status); /* We'll fall back on the worst case scenario: */ payload_size = sizeof(tDot11faddba_rsp); } else if (DOT11F_WARNED(status)) { - lim_log(mac_ctx, LOGW, FL("There were warnings while calculating the packed size for a ADDBA Response (0x%08x)."), status); + pe_warn("There were warnings while calculating the packed size for a ADDBA Response (0x%08x).", status); } num_bytes = payload_size + sizeof(*mgmt_hdr); qdf_status = cds_packet_alloc(num_bytes, (void **)&frame_ptr, (void **)&pkt_ptr); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - lim_log(mac_ctx, LOGP, - FL("Failed to allocate %d bytes for a ADDBA response action frame"), num_bytes); + pe_err("Failed to allocate %d bytes for a ADDBA response action frame", + num_bytes); return QDF_STATUS_E_FAILURE; } qdf_mem_set(frame_ptr, num_bytes, 0); @@ -4633,13 +4633,12 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, &payload_size); if (DOT11F_FAILED(status)) { - lim_log(mac_ctx, LOGE, - FL("Failed to pack a ADDBA Response (0x%08x)."), + pe_err("Failed to pack a ADDBA Response (0x%08x)", status); qdf_status = QDF_STATUS_E_FAILURE; goto error_addba_rsp; } else if (DOT11F_WARNED(status)) { - lim_log(mac_ctx, LOGW, FL("There were warnings while packing ADDBA Response (0x%08x)."), + pe_warn("There were warnings while packing ADDBA Response (0x%08x)", status); } @@ -4661,7 +4660,7 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { - lim_log(mac_ctx, LOGE, FL("wma_tx_frame FAILED! Status [%d]"), + pe_err("wma_tx_frame FAILED! Status [%d]", qdf_status); qdf_status = QDF_STATUS_E_FAILURE; /* diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c index 8903f52f06..eeaf6c5f5b 100644 --- a/core/mac/src/pe/nan/nan_datapath.c +++ b/core/mac/src/pe/nan/nan_datapath.c @@ -910,13 +910,13 @@ static QDF_STATUS lim_send_sme_ndp_add_sta_rsp(tpAniSirGlobal mac_ctx, add_sta_rsp->smesessionId, WLAN_NAN_ID); if (!add_sta_rsp) { - lim_log(mac_ctx, LOGE, FL("Invalid add_sta_rsp")); + pe_debug("Invalid add_sta_rsp"); return QDF_STATUS_E_INVAL; } new_peer_ind = qdf_mem_malloc(sizeof(*new_peer_ind)); if (!new_peer_ind) { - lim_log(mac_ctx, LOGE, FL("Failed to allocate memory")); + pe_debug("Failed to allocate memory"); return QDF_STATUS_E_NOMEM; } diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index ee1fbaf83d..8d0c0608aa 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -1299,8 +1299,7 @@ populate_dot11f_ht_info(tpAniSirGlobal pMac, pMac->lim.gHTServiceIntervalGranularity; if (psessionEntry == NULL) { - lim_log(pMac, LOG1, - FL("Keep the value retrieved from cfg for secondary channel offset and recommended Tx Width set")); + pe_debug("Keep the value retrieved from cfg for secondary channel offset and recommended Tx Width set"); } else { pHTInfoField1->secondaryChannelOffset = psessionEntry->htSecondaryChannelOffset; @@ -2210,7 +2209,7 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac, if (pr.vendor_he_cap.present) { qdf_mem_copy(&pProbeReq->vendor_he_cap, &pr.vendor_he_cap, sizeof(tDot11fIEvendor_he_cap)); - lim_log(pMac, LOG1, FL("11AX: HE cap IE present")); + pe_debug("11AX: HE cap IE present"); } return eSIR_SUCCESS; } /* End sir_convert_probe_req_frame2_struct. */ @@ -2569,12 +2568,12 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, } if (pr->vendor_he_cap.present) { - lim_log(pMac, LOG1, FL("11AX: HE cap IE present")); + pe_debug("11AX: HE cap IE present"); qdf_mem_copy(&pProbeResp->vendor_he_cap, &pr->vendor_he_cap, sizeof(tDot11fIEvendor_he_cap)); } if (pr->vendor_he_op.present) { - lim_log(pMac, LOG1, FL("11AX: HE operation IE present")); + pe_debug("11AX: HE operation IE present"); qdf_mem_copy(&pProbeResp->vendor_he_op, &pr->vendor_he_op, sizeof(tDot11fIEvendor_he_op)); } @@ -2777,8 +2776,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, if (ar->vendor_he_cap.present) { qdf_mem_copy(&pAssocReq->he_cap, &ar->vendor_he_cap, sizeof(tDot11fIEvendor_he_cap)); - lim_log(pMac, LOG1, - FL("Received Assoc Req with HE Capability IE")); + pe_debug("Received Assoc Req with HE Capability IE"); } qdf_mem_free(ar); @@ -2996,12 +2994,12 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, } if (ar.vendor_he_cap.present) { - lim_log(pMac, LOG1, FL("11AX: HE cap IE present")); + pe_debug("11AX: HE cap IE present"); qdf_mem_copy(&pAssocRsp->vendor_he_cap, &ar.vendor_he_cap, sizeof(tDot11fIEvendor_he_cap)); } if (ar.vendor_he_op.present) { - lim_log(pMac, LOG1, FL("11AX: HE Operation IE present")); + pe_debug("11AX: HE Operation IE present"); qdf_mem_copy(&pAssocRsp->vendor_he_op, &ar.vendor_he_op, sizeof(tDot11fIEvendor_he_op)); } @@ -4127,13 +4125,13 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, } if (pBeacon->vendor_he_cap.present) { - lim_log(pMac, LOG1, FL("11AX: HE cap IE present")); + pe_debug("11AX: HE cap IE present"); qdf_mem_copy(&pBeaconStruct->vendor_he_cap, &pBeacon->vendor_he_cap, sizeof(tDot11fIEvendor_he_cap)); } if (pBeacon->vendor_he_op.present) { - lim_log(pMac, LOG1, FL("11AX: HE operation IE present")); + pe_debug("11AX: HE operation IE present"); qdf_mem_copy(&pBeaconStruct->vendor_he_op, &pBeacon->vendor_he_op, sizeof(tDot11fIEvendor_he_op));