qcacld-3.0: Replace lim_log() with pe_* in lim_process_sme_req_messages.c
Replace lim_log() with pe_* appropriate log levels in
lim_process_sme_req_messages.c
Change-Id: I30b302e68b191f95a242c44dd3e9ad3b5793abd7
CRs-Fixed: 1093093
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 bba41a9..06d6b4b 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
@@ -143,7 +143,7 @@
buf = (struct s_sir_set_hw_mode *) msg;
if (!buf) {
- lim_log(mac, LOGE, FL("Set HW mode param is NULL"));
+ pe_err("Set HW mode param is NULL");
/* To free the active command list */
goto fail;
}
@@ -152,7 +152,7 @@
req_msg = qdf_mem_malloc(len);
if (!req_msg) {
- lim_log(mac, LOGE, FL("qdf_mem_malloc failed"));
+ pe_err("qdf_mem_malloc failed");
/* Free the active command list
* Probably the malloc is going to fail there as well?!
*/
@@ -166,11 +166,10 @@
message.bodyptr = req_msg;
message.type = SIR_HAL_PDEV_SET_HW_MODE;
- lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA"));
+ pe_debug("Posting SIR_HAL_SOC_SET_HW_MOD to WMA");
status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
if (!QDF_IS_STATUS_SUCCESS(status)) {
- lim_log(mac, LOGE,
- FL("scheduler_post_msg failed!(err=%d)"),
+ pe_err("scheduler_post_msg failed!(err=%d)",
status);
qdf_mem_free(req_msg);
goto fail;
@@ -179,7 +178,7 @@
fail:
param = qdf_mem_malloc(sizeof(*param));
if (!param) {
- lim_log(mac, LOGE, FL("HW mode resp failed"));
+ pe_err("HW mode resp failed");
return QDF_STATUS_E_FAILURE;
}
param->status = SET_HW_MODE_STATUS_ECANCELED;
@@ -214,7 +213,7 @@
buf = (struct sir_set_dual_mac_cfg *) msg;
if (!buf) {
- lim_log(mac, LOGE, FL("Set Dual mac config is NULL"));
+ pe_err("Set Dual mac config is NULL");
/* To free the active command list */
goto fail;
}
@@ -223,7 +222,7 @@
req_msg = qdf_mem_malloc(len);
if (!req_msg) {
- lim_log(mac, LOGE, FL("qdf_mem_malloc failed"));
+ pe_err("qdf_mem_malloc failed");
/* Free the active command list
* Probably the malloc is going to fail there as well?!
*/
@@ -237,13 +236,11 @@
message.bodyptr = req_msg;
message.type = SIR_HAL_PDEV_DUAL_MAC_CFG_REQ;
- lim_log(mac, LOG1,
- FL("Post SIR_HAL_PDEV_DUAL_MAC_CFG_REQ to WMA: %x %x"),
+ pe_debug("Post SIR_HAL_PDEV_DUAL_MAC_CFG_REQ to WMA: %x %x",
req_msg->scan_config, req_msg->fw_mode_config);
status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
if (!QDF_IS_STATUS_SUCCESS(status)) {
- lim_log(mac, LOGE,
- FL("scheduler_post_msg failed!(err=%d)"),
+ pe_err("scheduler_post_msg failed!(err=%d)",
status);
qdf_mem_free(req_msg);
goto fail;
@@ -252,7 +249,7 @@
fail:
param = qdf_mem_malloc(sizeof(*param));
if (!param) {
- lim_log(mac, LOGE, FL("Dual mac config resp failed"));
+ pe_err("Dual mac config resp failed");
return QDF_STATUS_E_FAILURE;
}
param->status = SET_HW_MODE_STATUS_ECANCELED;
@@ -285,14 +282,14 @@
buf = (struct sir_set_antenna_mode *) msg;
if (!buf) {
- lim_log(mac, LOGE, FL("Set antenna mode is NULL"));
+ pe_err("Set antenna mode is NULL");
/* To free the active command list */
goto fail;
}
req_msg = qdf_mem_malloc(sizeof(*req_msg));
if (!req_msg) {
- lim_log(mac, LOGE, FL("qdf_mem_malloc failed"));
+ pe_err("qdf_mem_malloc failed");
return QDF_STATUS_E_NOMEM;
}
@@ -302,14 +299,12 @@
message.bodyptr = req_msg;
message.type = SIR_HAL_SOC_ANTENNA_MODE_REQ;
- lim_log(mac, LOG1,
- FL("Post SIR_HAL_SOC_ANTENNA_MODE_REQ to WMA: %d %d"),
+ pe_debug("Post SIR_HAL_SOC_ANTENNA_MODE_REQ to WMA: %d %d",
req_msg->num_rx_chains,
req_msg->num_tx_chains);
status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
if (!QDF_IS_STATUS_SUCCESS(status)) {
- lim_log(mac, LOGE,
- FL("scheduler_post_msg failed!(err=%d)"),
+ pe_err("scheduler_post_msg failed!(err=%d)",
status);
qdf_mem_free(req_msg);
goto fail;
@@ -318,7 +313,7 @@
fail:
param = qdf_mem_malloc(sizeof(*param));
if (!param) {
- lim_log(mac, LOGE, FL("antenna mode resp failed"));
+ pe_err("antenna mode resp failed");
return QDF_STATUS_E_NOMEM;
}
param->status = SET_ANTENNA_MODE_STATUS_ECANCELED;
@@ -348,21 +343,19 @@
uint8_t valid_state = true;
int i;
- lim_log(mac_ctx, LOG1, FL("gLimSmeState: %d, returnFreshResults 0x%x"),
+
+ pe_debug("gLimSmeState: %d, returnFreshResults 0x%x",
mac_ctx->lim.gLimSmeState, return_fresh_results);
- if (mac_ctx->lim.gLimSmeState != eLIM_SME_IDLE_STATE) {
- lim_log(mac_ctx, LOG1, FL("return FALSE"));
+ if (mac_ctx->lim.gLimSmeState != eLIM_SME_IDLE_STATE)
return false;
- }
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
if (mac_ctx->lim.gpSession[i].valid == false)
continue;
- lim_log(mac_ctx, LOG1,
- FL("session %d, bsstype %d, limSystemRole %d, limSmeState %d"),
+ pe_debug("session %d, bsstype %d, limSystemRole %d, limSmeState %d",
i, mac_ctx->lim.gpSession[i].bssType,
mac_ctx->lim.gpSession[i].limSystemRole,
mac_ctx->lim.gpSession[i].limSmeState);
@@ -397,7 +390,7 @@
break;
}
- lim_log(mac_ctx, LOG1, FL("valid_state: %d"), valid_state);
+ pe_debug("valid_state: %d", valid_state);
if ((valid_state) &&
(return_fresh_results & SIR_BG_SCAN_RETURN_FRESH_RESULTS))
@@ -485,12 +478,10 @@
{
if (lim_is_system_in_scan_state(pMac)) {
if (lim_defer_msg(pMac, pMsg) != TX_SUCCESS) {
- lim_log(pMac, LOGE, FL("Could not defer Msg = %d"),
- pMsg->type);
+ pe_err("Could not defer Msg: %d", pMsg->type);
return false;
}
- lim_log(pMac, LOG1,
- FL("Defer the message, in learn mode type = %d"),
+ pe_debug("Defer the message, in learn mode type: %d",
pMsg->type);
return true;
}
@@ -522,12 +513,10 @@
*/
if (0) {
if (lim_defer_msg(mac_ctx, message) != TX_SUCCESS) {
- lim_log(mac_ctx, LOGE, FL("Could not defer Msg = %d"),
- message->type);
+ pe_err("Could not defer Msg: %d", message->type);
return false;
}
- lim_log(mac_ctx, LOG1,
- FL("Defer the message, in learn mode type = %d"),
+ pe_debug("Defer the message, in learn mode type: %d",
message->type);
return true;
}
@@ -561,11 +550,12 @@
pe_register_callbacks_with_wma(pMac, ready_req);
pMac->lim.add_bssdescr_callback = ready_req->add_bssdescr_cb;
}
- PELOGW(lim_log(pMac, LOGW, FL("sending WMA_SYS_READY_IND msg to HAL"));)
+
+ pe_debug("sending WMA_SYS_READY_IND msg to HAL");
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type));
if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) {
- lim_log(pMac, LOGP, FL("wma_post_ctrl_msg failed"));
+ pe_err("wma_post_ctrl_msg failed");
return true;
}
return false;
@@ -658,12 +648,11 @@
NULL, 0, 0);
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
- lim_log(mac_ctx, LOG1, FL("Received START_BSS_REQ"));
+ pe_debug("Received START_BSS_REQ");
size = sizeof(tSirSmeStartBssReq);
sme_start_bss_req = qdf_mem_malloc(size);
if (NULL == sme_start_bss_req) {
- lim_log(mac_ctx, LOGE,
- FL("Allocate Memory fail for LimStartBssReq"));
+ pe_err("Allocate Memory fail for LimStartBssReq");
/* Send failure response to host */
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto free;
@@ -676,8 +665,7 @@
(mac_ctx->lim.gLimSmeState == eLIM_SME_IDLE_STATE)) {
if (!lim_is_sme_start_bss_req_valid(mac_ctx,
sme_start_bss_req)) {
- lim_log(mac_ctx, LOGW,
- FL("Received invalid eWNI_SME_START_BSS_REQ"));
+ pe_warn("Received invalid eWNI_SME_START_BSS_REQ");
ret_code = eSIR_SME_INVALID_PARAMETERS;
goto free;
}
@@ -689,8 +677,7 @@
session = pe_find_session_by_bssid(mac_ctx,
sme_start_bss_req->bssid.bytes, &session_id);
if (session != NULL) {
- lim_log(mac_ctx, LOGW,
- FL("Session Already exists for given BSSID"));
+ pe_warn("Session Already exists for given BSSID");
ret_code = eSIR_SME_BSS_ALREADY_STARTED_OR_JOINED;
session = NULL;
goto free;
@@ -700,8 +687,7 @@
&session_id, mac_ctx->lim.maxStation,
sme_start_bss_req->bssType);
if (session == NULL) {
- lim_log(mac_ctx, LOGW,
- FL("Session Can not be created "));
+ pe_warn("Session Can not be created");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto free;
}
@@ -808,8 +794,7 @@
#ifdef WLAN_FEATURE_11W
session->limRmfEnabled =
sme_start_bss_req->pmfCapable ? 1 : 0;
- lim_log(mac_ctx, LOG1, FL("Session RMF enabled: %d"),
- session->limRmfEnabled);
+ pe_debug("Session RMF enabled: %d", session->limRmfEnabled);
#endif
qdf_mem_copy((void *)&session->rateSet,
@@ -864,7 +849,7 @@
break;
}
- lim_log(mac_ctx, LOG1, FL("persona - %d, nss - %d"),
+ pe_debug("persona - %d, nss - %d",
session->pePersona, session->vdev_nss);
session->nss = session->vdev_nss;
/*
@@ -876,8 +861,7 @@
qdf_mem_malloc(session->dph.dphHashTable.
size * sizeof(tpSirAssocReq));
if (NULL == session->parsedAssocReq) {
- lim_log(mac_ctx, LOGW,
- FL("AllocateMemory() failed"));
+ pe_warn("AllocateMemory() failed");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto free;
}
@@ -885,8 +869,7 @@
if (!sme_start_bss_req->channelId &&
sme_start_bss_req->bssType != eSIR_NDI_MODE) {
- lim_log(mac_ctx, LOGE,
- FL("Received invalid eWNI_SME_START_BSS_REQ"));
+ pe_err("Received invalid eWNI_SME_START_BSS_REQ");
ret_code = eSIR_SME_INVALID_PARAMETERS;
goto free;
}
@@ -908,8 +891,7 @@
if (lim_is_session_he_capable(session) ||
session->vhtCapability || session->htCapability) {
chanwidth = sme_start_bss_req->vht_channel_width;
- lim_log(mac_ctx, LOG1,
- FL("vht_channel_width %u htSupportedChannelWidthSet %d"),
+ pe_debug("vht_channel_width %u htSupportedChannelWidthSet %d",
sme_start_bss_req->vht_channel_width,
session->htSupportedChannelWidthSet);
session->ch_width = chanwidth;
@@ -927,10 +909,9 @@
if (session->vhtCapability &&
(session->ch_width > CH_WIDTH_80MHZ)) {
session->nss = 1;
- lim_log(mac_ctx, LOG1, FL("nss set to [%d]"),
- session->nss);
+ pe_debug("nss set to [%d]", session->nss);
}
- lim_log(mac_ctx, LOG1, FL("vht su tx bformer %d"),
+ pe_debug("vht su tx bformer %d",
session->vht_config.su_beam_former);
/* Delete pre-auth list if any */
@@ -968,8 +949,7 @@
/* Prepare and Issue LIM_MLM_START_REQ to MLM */
mlm_start_req = qdf_mem_malloc(sizeof(tLimMlmStartReq));
if (NULL == mlm_start_req) {
- lim_log(mac_ctx, LOGP,
- FL("Allocate Memory failed for mlmStartReq"));
+ pe_err("Allocate Memory failed for mlmStartReq");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto free;
}
@@ -1002,8 +982,7 @@
WNI_CFG_IBSS_AUTO_BSSID,
&auto_gen_bssid);
if (ret_status != eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGP,
- FL("Get Auto Gen BSSID fail,Status=%d"),
+ pe_err("Get Auto Gen BSSID fail,Status: %d",
ret_status);
ret_code = eSIR_LOGP_EXCEPTION;
goto free;
@@ -1058,21 +1037,18 @@
} else {
if (wlan_cfg_get_int(mac_ctx,
WNI_CFG_DTIM_PERIOD, &val) != eSIR_SUCCESS)
- lim_log(mac_ctx, LOGP,
- FL("could not retrieve DTIM Period"));
+ pe_err("could not retrieve DTIM Period");
mlm_start_req->dtimPeriod = (uint8_t) val;
}
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_CFP_PERIOD, &val) !=
eSIR_SUCCESS)
- lim_log(mac_ctx, LOGP,
- FL("could not retrieve Beacon interval"));
+ pe_err("could not retrieve Beacon interval");
mlm_start_req->cfParamSet.cfpPeriod = (uint8_t) val;
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_CFP_MAX_DURATION, &val) !=
eSIR_SUCCESS)
- lim_log(mac_ctx, LOGP,
- FL("could not retrieve CFPMaxDuration"));
+ pe_err("could not retrieve CFPMaxDuration");
mlm_start_req->cfParamSet.cfpMaxDuration = (uint16_t) val;
/*
@@ -1103,8 +1079,7 @@
(SIR_BAND_5_GHZ == session->limRFBand)) {
if (wlan_cfg_get_int(mac_ctx,
WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS)
- lim_log(mac_ctx, LOGP,
- FL("Fail to get WNI_CFG_11H_ENABLED "));
+ pe_err("Fail to get WNI_CFG_11H_ENABLED");
else
session->lim11hEnable = val;
@@ -1119,8 +1094,7 @@
}
if (cfg_get_wmi_dfs_master_param != eSIR_SUCCESS)
/* Failed get CFG WNI_CFG_DFS_MASTER_ENABLED */
- lim_log(mac_ctx, LOGE,
- FL("Get Fail, CFG DFS ENABLE"));
+ pe_err("Get Fail, CFG DFS ENABLE");
}
if (!session->lim11hEnable) {
@@ -1131,8 +1105,7 @@
* Failed to set the CFG param
* WNI_CFG_LOCAL_POWER_CONSTRAINT
*/
- lim_log(mac_ctx, LOGE,
- FL("Set LOCAL_POWER_CONSTRAINT failed"));
+ pe_err("Set LOCAL_POWER_CONSTRAINT failed");
}
session->limPrevSmeState = session->limSmeState;
@@ -1147,8 +1120,7 @@
return;
} else {
- lim_log(mac_ctx, LOGE,
- FL("Received unexpected START_BSS_REQ, in state %X"),
+ pe_err("Received unexpected START_BSS_REQ, in state %X",
mac_ctx->lim.gLimSmeState);
ret_code = eSIR_SME_BSS_ALREADY_STARTED_OR_JOINED;
goto free;
@@ -1247,19 +1219,16 @@
if (eSIR_SUCCESS != status) {
extcap_present = false;
- lim_log(pMac, LOG1,
- FL("Unable to Strip ExtCap IE from Scan Req"));
+ pe_debug("Unable to Strip ExtCap IE from Scan Req");
}
if (extcap_present) {
- lim_log(pMac, LOG1,
- FL("Extcap was part of SCAN IE - Updating FW"));
+ pe_debug("Extcap was part of SCAN IE - Updating FW");
lim_send_ext_cap_ie(pMac, pScanReq->sessionId,
&extracted_extcap, true);
}
} else {
- lim_log(pMac, LOG1,
- FL("No IEs in the scan request from supplicant"));
+ pe_debug("No IEs in the scan request from supplicant");
}
/**
@@ -1272,8 +1241,7 @@
pScanOffloadReq = qdf_mem_malloc(len);
if (NULL == pScanOffloadReq) {
- lim_log(pMac, LOGE,
- FL("AllocateMemory failed for pScanOffloadReq"));
+ pe_err("AllocateMemory failed for pScanOffloadReq");
return QDF_STATUS_E_NOMEM;
}
@@ -1284,8 +1252,7 @@
qdf_copy_macaddr(&pScanOffloadReq->bssId, &pScanReq->bssId);
if (pScanReq->numSsid > SIR_SCAN_MAX_NUM_SSID) {
- lim_log(pMac, LOGE,
- FL("Invalid value (%d) for numSsid"),
+ pe_err("Invalid value (%d) for numSsid",
SIR_SCAN_MAX_NUM_SSID);
qdf_mem_free(pScanOffloadReq);
return QDF_STATUS_E_FAILURE;
@@ -1324,7 +1291,7 @@
pScanReq->scan_adaptive_dwell_mode;
if (pScanOffloadReq->sessionId >= pMac->lim.maxBssId)
- lim_log(pMac, LOGE, FL("Invalid pe sessionID : %d"),
+ pe_err("Invalid pe sessionID: %d",
pScanOffloadReq->sessionId);
pScanOffloadReq->channelList.numChannels =
@@ -1343,12 +1310,12 @@
rc = wma_post_ctrl_msg(pMac, &msg);
if (rc != eSIR_SUCCESS) {
- lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure"));
+ pe_err("wma_post_ctrl_msg() return failure");
qdf_mem_free(pScanOffloadReq);
return QDF_STATUS_E_FAILURE;
}
- lim_log(pMac, LOG1, FL("Processed Offload Scan Request Successfully"));
+ pe_debug("Processed Offload Scan Request Successfully");
return QDF_STATUS_SUCCESS;
}
@@ -1377,8 +1344,7 @@
mac_ctx->lim.beacon_probe_rsp_cnt_per_scan = 0;
scan_req = (tpSirSmeScanReq) msg_buf;
- lim_log(mac_ctx, LOG1,
- FL("SME SCAN REQ id %d numChan %d min %d max %d IELen %d first %d fresh %d unique %d type %s (%d) rsp %d"),
+ pe_debug("SME SCAN REQ id %d numChan %d min %d max %d IELen %d first %d fresh %d unique %d type %s (%d) rsp %d",
scan_req->scan_id, scan_req->channelList.numChannels,
scan_req->minChannelTime, scan_req->maxChannelTime,
scan_req->uIEFieldLen, scan_req->returnAfterFirstMatch,
@@ -1410,8 +1376,7 @@
valid_req = lim_is_sme_scan_req_valid(mac_ctx, scan_req);
if (!valid_req || mac_ctx->lim.scan_disabled) {
- lim_log(mac_ctx, LOGE,
- FL("Scan disabled %d, Valid Scan Req %d"),
+ pe_err("Scan disabled %d, Valid Scan Req %d",
mac_ctx->lim.scan_disabled, valid_req);
if (mac_ctx->lim.gLimRspReqd) {
@@ -1446,8 +1411,7 @@
if (QDF_STATUS_SUCCESS !=
lim_send_hal_start_scan_offload_req(mac_ctx,
scan_req)) {
- lim_log(mac_ctx, LOGE, FL(
- "Couldn't send Offload scan request"));
+ pe_err("Couldn't send Offload scan request");
lim_send_sme_scan_rsp(mac_ctx,
eSIR_SME_INVALID_PARAMETERS,
scan_req->sessionId,
@@ -1544,8 +1508,7 @@
sme_join_req = qdf_mem_malloc(n_size);
if (NULL == sme_join_req) {
- lim_log(mac_ctx, LOGP,
- FL("AllocateMemory failed for sme_join_req"));
+ pe_err("AllocateMemory failed for sme_join_req");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto end;
}
@@ -1555,8 +1518,7 @@
if (!lim_is_sme_join_req_valid(mac_ctx, sme_join_req)) {
/* Received invalid eWNI_SME_JOIN_REQ */
/* Log the event */
- lim_log(mac_ctx, LOGW,
- FL("SessionId:%d JOIN REQ with invalid data"),
+ pe_warn("SessionId:%d JOIN REQ with invalid data",
sme_join_req->sessionId);
ret_code = eSIR_SME_INVALID_PARAMETERS;
goto end;
@@ -1576,9 +1538,8 @@
&session_id);
if (session != NULL) {
- lim_log(mac_ctx, LOGE,
- FL("Session(%d) Already exists for BSSID: "
- MAC_ADDRESS_STR " in limSmeState = %X"),
+ pe_err("Session(%d) Already exists for BSSID: "
+ MAC_ADDRESS_STR " in limSmeState = %X",
session_id,
MAC_ADDR_ARRAY(bss_desc->bssId),
session->limSmeState);
@@ -1590,17 +1551,14 @@
* BSS as currently associated.
* Log the event and send success
*/
- lim_log(mac_ctx, LOGW,
- FL("SessionId: %d"), session_id);
- lim_log(mac_ctx, LOGW,
- FL("JOIN_REQ for current joined BSS"));
+ pe_warn("SessionId: %d", session_id);
+ pe_warn("JOIN_REQ for current joined BSS");
/* Send Join success response to host */
ret_code = eSIR_SME_ALREADY_JOINED_A_BSS;
session = NULL;
goto end;
} else {
- lim_log(mac_ctx, LOGE,
- FL("JOIN_REQ not for current joined BSS"));
+ pe_err("JOIN_REQ not for current joined BSS");
ret_code = eSIR_SME_REFUSED;
session = NULL;
goto end;
@@ -1614,13 +1572,11 @@
&session_id, mac_ctx->lim.maxStation,
eSIR_INFRASTRUCTURE_MODE);
if (session == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("Session Can not be created "));
+ pe_err("Session Can not be created");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto end;
} else
- lim_log(mac_ctx, LOG2,
- FL("SessionId:%d New session created"),
+ pe_debug("SessionId:%d New session created",
session_id);
}
session->isAmsduSupportInAMPDU =
@@ -1671,7 +1627,7 @@
((uint8_t *)&bss_desc->ieFields), ie_len);
if (NULL != vendor_ie) {
- lim_log(mac_ctx, LOG1, FL("Cisco vendor OUI present"));
+ pe_debug("Cisco vendor OUI present");
session->isCiscoVendorAP = true;
} else {
session->isCiscoVendorAP = false;
@@ -1698,8 +1654,7 @@
session->supported_nss_1x1 = true;
/*Store Persona */
session->pePersona = sme_join_req->staPersona;
- lim_log(mac_ctx, LOG1,
- FL("enable Smps: %d mode: %d send action: %d supported nss 1x1: %d pePersona %d cbMode %d"),
+ pe_debug("enable Smps: %d mode: %d send action: %d supported nss 1x1: %d pePersona %d cbMode %d",
session->enableHtSmps,
session->htSmpsvalue,
session->send_smps_action,
@@ -1738,7 +1693,7 @@
sme_join_req->enableVhtpAid;
session->enableVhtGid =
sme_join_req->enableVhtGid;
- lim_log(mac_ctx, LOG1, FL("vht su bformer [%d]"),
+ pe_debug("vht su bformer [%d]",
session->vht_config.su_beam_former);
}
@@ -1747,8 +1702,7 @@
lim_copy_join_req_he_cap(session, sme_join_req);
}
- lim_log(mac_ctx, LOG1,
- FL("vhtCapability: %d su_beam_formee: %d txbf_csn_value: %d su_tx_bformer %d"),
+ pe_debug("vhtCapability: %d su_beam_formee: %d txbf_csn_value: %d su_tx_bformer %d",
session->vhtCapability,
session->vht_config.su_beam_formee,
session->vht_config.csnof_beamformer_antSup,
@@ -1819,8 +1773,7 @@
* Throw an error and return and make
* sure to delete the session.
*/
- lim_log(mac_ctx, LOGE,
- FL("recvd JOIN_REQ with invalid bss type %d"),
+ pe_err("recvd JOIN_REQ with invalid bss type %d",
session->bssType);
ret_code = eSIR_SME_INVALID_PARAMETERS;
goto end;
@@ -1838,8 +1791,7 @@
session->pLimJoinReq->bssDescription.length + 2;
mlm_join_req = qdf_mem_malloc(val);
if (NULL == mlm_join_req) {
- lim_log(mac_ctx, LOGP,
- FL("AllocateMemory failed for mlmJoinReq"));
+ pe_err("AllocateMemory failed for mlmJoinReq");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto end;
}
@@ -1850,9 +1802,8 @@
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_JOIN_FAILURE_TIMEOUT,
(uint32_t *) &mlm_join_req->joinFailureTimeout) !=
eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGP,
- FL("couldn't retrieve JoinFailureTimer value"
- " setting to default value"));
+ pe_err("couldn't retrieve JoinFailureTimer value"
+ " setting to default value");
mlm_join_req->joinFailureTimeout =
WNI_CFG_JOIN_FAILURE_TIMEOUT_STADEF;
}
@@ -1914,15 +1865,13 @@
local_power_constraint,
mac_ctx->roam.configParam.nTxPowerCap);
- lim_log(mac_ctx, LOG1,
- FL("Reg max %d local power con %d max tx pwr %d"),
+ pe_debug("Reg max %d local power con %d max tx pwr %d",
reg_max, local_power_constraint, session->maxTxPower);
if (session->gLimCurrentBssUapsd) {
session->gUapsdPerAcBitmask =
session->pLimJoinReq->uapsdPerAcBitmask;
- lim_log(mac_ctx, LOG1,
- FL("UAPSD flag for all AC - 0x%2x"),
+ pe_debug("UAPSD flag for all AC - 0x%2x",
session->gUapsdPerAcBitmask);
/* resetting the dynamic uapsd mask */
@@ -1937,8 +1886,7 @@
if (SIR_BAND_5_GHZ == session->limRFBand) {
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11H_ENABLED,
&val) != eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGP,
- FL("Fail to get WNI_CFG_11H_ENABLED "));
+ pe_err("Fail to get WNI_CFG_11H_ENABLED");
session->lim11hEnable =
WNI_CFG_11H_ENABLED_STADEF;
} else {
@@ -1979,8 +1927,7 @@
} else {
/* Received eWNI_SME_JOIN_REQ un expected state */
- lim_log(mac_ctx, LOGE,
- FL("received unexpected SME_JOIN_REQ in state %X"),
+ pe_err("received unexpected SME_JOIN_REQ in state %X",
mac_ctx->lim.gLimSmeState);
lim_print_sme_state(mac_ctx, LOGE, mac_ctx->lim.gLimSmeState);
ret_code = eSIR_SME_UNEXPECTED_REQ_RESULT_CODE;
@@ -2004,8 +1951,7 @@
session = NULL;
}
}
- lim_log(mac_ctx, LOG1,
- FL("Send failure status on sessionid: %d with ret_code = %d"),
+ pe_debug("Send failure status on sessionid: %d with ret_code: %d",
sme_session_id, ret_code);
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP, ret_code,
eSIR_MAC_UNSPEC_FAILURE_STATUS, session, sme_session_id,
@@ -2056,13 +2002,10 @@
uint32_t tele_bcn_en = 0;
uint16_t size;
- lim_log(mac_ctx, LOG3, FL("Received REASSOC_REQ"));
-
size = __lim_get_sme_join_req_size_for_alloc((uint8_t *)msg_buf);
reassoc_req = qdf_mem_malloc(size);
if (NULL == reassoc_req) {
- lim_log(mac_ctx, LOGP,
- FL("call to AllocateMemory failed for reassoc_req"));
+ pe_err("call to AllocateMemory failed for reassoc_req");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto end;
@@ -2074,8 +2017,7 @@
/*
* Received invalid eWNI_SME_REASSOC_REQ
*/
- lim_log(mac_ctx, LOGW,
- FL("received SME_REASSOC_REQ with invalid data"));
+ pe_warn("received SME_REASSOC_REQ with invalid data");
ret_code = eSIR_SME_INVALID_PARAMETERS;
goto end;
@@ -2085,8 +2027,7 @@
reassoc_req->bssDescription.bssId,
&session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("Session does not exist for given bssId"));
+ pe_err("Session does not exist for given bssId");
lim_print_mac_addr(mac_ctx, reassoc_req->bssDescription.bssId,
LOGE);
ret_code = eSIR_SME_INVALID_PARAMETERS;
@@ -2126,12 +2067,10 @@
reassoc_req->enableVhtpAid;
session_entry->enableVhtGid =
reassoc_req->enableVhtGid;
- lim_log(mac_ctx, LOG1, FL("vht su bformer [%d]"),
- session_entry->vht_config.su_beam_former);
+ pe_debug("vht su bformer [%d]", session_entry->vht_config.su_beam_former);
}
- lim_log(mac_ctx, LOG1,
- FL("vhtCapability: %d su_beam_formee: %d su_tx_bformer %d"),
+ pe_debug("vhtCapability: %d su_beam_formee: %d su_tx_bformer %d",
session_entry->vhtCapability,
session_entry->vht_config.su_beam_formee,
session_entry->vht_config.su_beam_former);
@@ -2140,8 +2079,7 @@
session_entry->htSmpsvalue = reassoc_req->htSmps;
session_entry->send_smps_action =
reassoc_req->send_smps_action;
- lim_log(mac_ctx, LOG1,
- FL("enableHtSmps: %d htSmps: %d send action: %d supported nss 1x1: %d"),
+ pe_debug("enableHtSmps: %d htSmps: %d send action: %d supported nss 1x1: %d",
session_entry->enableHtSmps,
session_entry->htSmpsvalue,
session_entry->send_smps_action,
@@ -2157,8 +2095,7 @@
* May be from 11r FT pre-auth. So lets check it
* before we bail out
*/
- lim_log(mac_ctx, LOG1, FL(
- "Session in reassoc state is %d"),
+ pe_debug("Session in reassoc state is %d",
session_entry->peSessionId);
/* Make sure its our preauth bssid */
@@ -2168,8 +2105,7 @@
lim_print_mac_addr(mac_ctx,
reassoc_req->bssDescription.
bssId, LOGE);
- lim_log(mac_ctx, LOGP,
- FL("Unknown bssId in reassoc state"));
+ pe_err("Unknown bssId in reassoc state");
ret_code = eSIR_SME_INVALID_PARAMETERS;
goto end;
}
@@ -2181,8 +2117,7 @@
/*
* Should not have received eWNI_SME_REASSOC_REQ
*/
- lim_log(mac_ctx, LOGE,
- FL("received unexpected SME_REASSOC_REQ in state %X"),
+ pe_err("received unexpected SME_REASSOC_REQ in state %X",
session_entry->limSmeState);
lim_print_sme_state(mac_ctx, LOGE, session_entry->limSmeState);
@@ -2219,8 +2154,7 @@
&session_entry->gLimCurrentBssUapsd,
&local_pwr_constraint, session_entry);
session_entry->maxTxPower = QDF_MIN(reg_max, (local_pwr_constraint));
- lim_log(mac_ctx, LOGE,
- FL("Reg max = %d, local pwr constraint = %d, max tx = %d"),
+ pe_err("Reg max = %d, local pwr constraint = %d, max tx = %d",
reg_max, local_pwr_constraint, session_entry->maxTxPower);
/* Copy the SSID from session entry to local variable */
session_entry->limReassocSSID.length = reassoc_req->ssId.length;
@@ -2230,15 +2164,13 @@
if (session_entry->gLimCurrentBssUapsd) {
session_entry->gUapsdPerAcBitmask =
session_entry->pLimReAssocReq->uapsdPerAcBitmask;
- lim_log(mac_ctx, LOG1,
- FL("UAPSD flag for all AC - 0x%2x"),
+ pe_debug("UAPSD flag for all AC - 0x%2x",
session_entry->gUapsdPerAcBitmask);
}
mlm_reassoc_req = qdf_mem_malloc(sizeof(tLimMlmReassocReq));
if (NULL == mlm_reassoc_req) {
- lim_log(mac_ctx, LOGP,
- FL("call to AllocateMemory failed for mlmReassocReq"));
+ pe_err("call to AllocateMemory failed for mlmReassocReq");
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
goto end;
@@ -2249,28 +2181,16 @@
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
(uint32_t *)&mlm_reassoc_req->reassocFailureTimeout) !=
- eSIR_SUCCESS) {
- /*
- * Could not get ReassocFailureTimeout value
- * from CFG. Log error.
- */
- lim_log(mac_ctx, LOGP,
- FL("could not retrieve ReassocFailureTimeout value"));
- }
+ eSIR_SUCCESS)
+ pe_err("could not retrieve ReassocFailureTimeout value");
if (cfg_get_capability_info(mac_ctx, &caps, session_entry) !=
- eSIR_SUCCESS) {
- /*
- * Could not get Capabilities value
- * from CFG. Log error.
- */
- lim_log(mac_ctx, LOGP, FL(
- "could not retrieve Capabilities value"));
- }
+ eSIR_SUCCESS)
+ pe_err("could not retrieve Capabilities value");
lim_update_caps_info_for_bss(mac_ctx, &caps,
reassoc_req->bssDescription.capabilityInfo);
- lim_log(mac_ctx, LOG1, FL("Capabilities info Reassoc: 0x%X"), caps);
+ pe_debug("Capabilities info Reassoc: 0x%X", caps);
mlm_reassoc_req->capabilityInfo = caps;
@@ -2283,29 +2203,18 @@
*/
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_TELE_BCN_WAKEUP_EN,
&tele_bcn_en) != eSIR_SUCCESS)
- lim_log(mac_ctx, LOGP,
- FL("Couldn't get WNI_CFG_TELE_BCN_WAKEUP_EN"));
+ pe_err("Couldn't get WNI_CFG_TELE_BCN_WAKEUP_EN");
val = WNI_CFG_LISTEN_INTERVAL_STADEF;
if (tele_bcn_en) {
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_TELE_BCN_MAX_LI, &val) !=
eSIR_SUCCESS)
- /*
- * Could not get ListenInterval value
- * from CFG. Log error.
- */
- lim_log(mac_ctx, LOGP,
- FL("could not retrieve ListenInterval"));
+ pe_err("could not retrieve ListenInterval");
} else {
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_LISTEN_INTERVAL, &val) !=
eSIR_SUCCESS)
- /*
- * Could not get ListenInterval value
- * from CFG. Log error.
- */
- lim_log(mac_ctx, LOGP,
- FL("could not retrieve ListenInterval"));
+ pe_err("could not retrieve ListenInterval");
}
mlm_reassoc_req->listenInterval = (uint16_t) val;
@@ -2343,7 +2252,7 @@
*/
sme_session_id = session_entry->smeSessionId;
transaction_id = session_entry->transactionId;
- } else
+ } else {
/*
* error occurred before or during the time we determined
* the session so extract the session and transaction info
@@ -2351,7 +2260,7 @@
*/
lim_get_session_info(mac_ctx, (uint8_t *) msg_buf,
&sme_session_id, &transaction_id);
-
+ }
/*
* Send Reassoc failure response to host
* (note session_entry may be NULL, but that's OK)
@@ -2393,7 +2302,7 @@
uint16_t smetransactionId;
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -2403,8 +2312,7 @@
if (!lim_is_sme_disassoc_req_valid(pMac,
&smeDisassocReq,
psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE,
- FL("received invalid SME_DISASSOC_REQ message"));)
+ pe_err("received invalid SME_DISASSOC_REQ message");
if (pMac->lim.gLimRspReqd) {
pMac->lim.gLimRspReqd = false;
@@ -2420,17 +2328,15 @@
smeDisassocReq.bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGE,
- FL("session does not exist for given bssId "
- MAC_ADDRESS_STR),
+ pe_err("session does not exist for given bssId "
+ MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes));
retCode = eSIR_SME_INVALID_PARAMETERS;
disassocTrigger = eLIM_HOST_DISASSOC;
goto sendDisassoc;
}
- lim_log(pMac, LOG1,
- FL("received DISASSOC_REQ message on sessionid %d Systemrole %d Reason: %u SmeState: %d from: "
- MAC_ADDRESS_STR), smesessionId,
+ pe_debug("received DISASSOC_REQ message on sessionid %d Systemrole %d Reason: %u SmeState: %d from: "
+ MAC_ADDRESS_STR, smesessionId,
GET_LIM_SYSTEM_ROLE(psessionEntry), smeDisassocReq.reasonCode,
pMac->lim.gLimSmeState,
MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes));
@@ -2444,7 +2350,7 @@
psessionEntry->smeSessionId = smesessionId;
psessionEntry->transactionId = smetransactionId;
- lim_log(pMac, LOGD, FL("ho_fail: %d "), smeDisassocReq.process_ho_fail);
+ pe_debug("ho_fail: %d ", smeDisassocReq.process_ho_fail);
psessionEntry->process_ho_fail = smeDisassocReq.process_ho_fail;
switch (GET_LIM_SYSTEM_ROLE(psessionEntry)) {
@@ -2452,8 +2358,7 @@
switch (psessionEntry->limSmeState) {
case eLIM_SME_ASSOCIATED_STATE:
case eLIM_SME_LINK_EST_STATE:
- lim_log(pMac, LOG1,
- FL("Rcvd SME_DISASSOC_REQ in limSmeState: %d "),
+ pe_debug("Rcvd SME_DISASSOC_REQ in limSmeState: %d ",
psessionEntry->limSmeState);
psessionEntry->limPrevSmeState =
psessionEntry->limSmeState;
@@ -2476,8 +2381,7 @@
(pMac, TRACE_CODE_SME_STATE,
psessionEntry->peSessionId,
psessionEntry->limSmeState));
- lim_log(pMac, LOG1,
- FL("Rcvd SME_DISASSOC_REQ while in SME_WT_DEAUTH_STATE. "));
+ pe_debug("Rcvd SME_DISASSOC_REQ while in SME_WT_DEAUTH_STATE");
break;
case eLIM_SME_WT_DISASSOC_STATE:
@@ -2490,14 +2394,12 @@
* It will send a disassoc, which is ok. However, we can use the global flag
* sendDisassoc to not send disassoc frame.
*/
- lim_log(pMac, LOG1,
- FL("Rcvd SME_DISASSOC_REQ while in SME_WT_DISASSOC_STATE. "));
+ pe_debug("Rcvd SME_DISASSOC_REQ while in SME_WT_DISASSOC_STATE");
break;
case eLIM_SME_JOIN_FAILURE_STATE: {
/* Already in Disconnected State, return success */
- lim_log(pMac, LOG1,
- FL("Rcvd SME_DISASSOC_REQ while in eLIM_SME_JOIN_FAILURE_STATE. "));
+ pe_debug("Rcvd SME_DISASSOC_REQ while in eLIM_SME_JOIN_FAILURE_STATE");
if (pMac->lim.gLimRspReqd) {
retCode = eSIR_SME_SUCCESS;
disassocTrigger = eLIM_HOST_DISASSOC;
@@ -2510,8 +2412,7 @@
* STA is not currently associated.
* Log error and send response to host
*/
- lim_log(pMac, LOGE,
- FL("received unexpected SME_DISASSOC_REQ in state %X"),
+ pe_err("received unexpected SME_DISASSOC_REQ in state %X",
psessionEntry->limSmeState);
lim_print_sme_state(pMac, LOGE,
psessionEntry->limSmeState);
@@ -2538,8 +2439,7 @@
case eLIM_STA_IN_IBSS_ROLE:
default:
/* eLIM_UNKNOWN_ROLE */
- lim_log(pMac, LOGE,
- FL("received unexpected SME_DISASSOC_REQ for role %d"),
+ pe_err("received unexpected SME_DISASSOC_REQ for role %d",
GET_LIM_SYSTEM_ROLE(psessionEntry));
retCode = eSIR_SME_UNEXPECTED_REQ_RESULT_CODE;
@@ -2551,20 +2451,17 @@
reasonCode = smeDisassocReq.reasonCode;
if (smeDisassocReq.doNotSendOverTheAir) {
- lim_log(pMac, LOG1, FL("do not send dissoc over the air"));
+ pe_debug("do not send dissoc over the air");
send_disassoc_frame = 0;
}
/* Trigger Disassociation frame to peer MAC entity */
- lim_log(pMac, LOG1, FL("Sending Disasscoc with disassoc Trigger"
- " : %d, reasonCode : %d"),
+ pe_debug("Sending Disasscoc with disassoc Trigger"
+ " : %d, reasonCode : %d",
disassocTrigger, reasonCode);
pMlmDisassocReq = qdf_mem_malloc(sizeof(tLimMlmDisassocReq));
if (NULL == pMlmDisassocReq) {
- /* Log error */
- lim_log(pMac, LOGP,
- FL("call to AllocateMemory failed for mlmDisassocReq"));
-
+ pe_err("call to AllocateMemory failed for mlmDisassocReq");
return;
}
@@ -2616,8 +2513,6 @@
tpPESession psessionEntry;
uint8_t sessionId;
- PELOG1(lim_log(pMac, LOG1, FL("received DISASSOC_CNF message"));)
-
qdf_mem_copy(&smeDisassocCnf, pMsgBuf,
sizeof(struct sSirSmeDisassocCnf));
@@ -2625,14 +2520,12 @@
smeDisassocCnf.bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGE,
- FL("session does not exist for given bssId"));
+ pe_err("session does not exist for given bssId");
return;
}
if (!lim_is_sme_disassoc_cnf_valid(pMac, &smeDisassocCnf, psessionEntry)) {
- lim_log(pMac, LOGE,
- FL("received invalid SME_DISASSOC_CNF message"));
+ pe_err("received invalid SME_DISASSOC_CNF message");
return;
}
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
@@ -2652,9 +2545,7 @@
(psessionEntry->limSmeState != eLIM_SME_WT_DISASSOC_STATE)
&& (psessionEntry->limSmeState !=
eLIM_SME_WT_DEAUTH_STATE)) {
- lim_log(pMac, LOGE,
- FL
- ("received unexp SME_DISASSOC_CNF in state %X"),
+ pe_err("received unexp SME_DISASSOC_CNF in state %X",
psessionEntry->limSmeState);
lim_print_sme_state(pMac, LOGE,
psessionEntry->limSmeState);
@@ -2668,8 +2559,7 @@
case eLIM_STA_IN_IBSS_ROLE:
default: /* eLIM_UNKNOWN_ROLE */
- lim_log(pMac, LOGE,
- FL("received unexpected SME_DISASSOC_CNF role %d"),
+ pe_err("received unexpected SME_DISASSOC_CNF role %d",
GET_LIM_SYSTEM_ROLE(psessionEntry));
return;
@@ -2682,9 +2572,8 @@
smeDisassocCnf.peer_macaddr.bytes, &aid,
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
- lim_log(pMac, LOGE,
- FL("DISASSOC_CNF for a STA with no context, addr= "
- MAC_ADDRESS_STR),
+ pe_err("DISASSOC_CNF for a STA with no context, addr= "
+ MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes));
return;
}
@@ -2693,8 +2582,7 @@
eLIM_MLM_WT_DEL_STA_RSP_STATE) ||
(pStaDs->mlmStaContext.mlmState ==
eLIM_MLM_WT_DEL_STA_RSP_STATE)) {
- lim_log(pMac, LOGE,
- FL("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d"),
+ pe_err("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d",
MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes),
pStaDs->mlmStaContext.mlmState);
return;
@@ -2734,8 +2622,6 @@
uint8_t sme_session_id;
uint16_t sme_transaction_id;
- lim_log(mac_ctx, LOG1, FL("received DEAUTH_REQ message"));
-
qdf_mem_copy(&sme_deauth_req, msg_buf, sizeof(tSirSmeDeauthReq));
sme_session_id = sme_deauth_req.sessionId;
sme_transaction_id = sme_deauth_req.transactionId;
@@ -2748,8 +2634,7 @@
sme_deauth_req.bssid.bytes,
&session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("session does not exist for given bssId"));
+ pe_err("session does not exist for given bssId");
ret_code = eSIR_SME_INVALID_PARAMETERS;
deauth_trigger = eLIM_HOST_DEAUTH;
goto send_deauth;
@@ -2757,17 +2642,15 @@
if (!lim_is_sme_deauth_req_valid(mac_ctx, &sme_deauth_req,
session_entry)) {
- lim_log(mac_ctx, LOGE,
- FL("received invalid SME_DEAUTH_REQ message"));
+ pe_err("received invalid SME_DEAUTH_REQ message");
mac_ctx->lim.gLimRspReqd = false;
ret_code = eSIR_SME_INVALID_PARAMETERS;
deauth_trigger = eLIM_HOST_DEAUTH;
goto send_deauth;
}
- lim_log(mac_ctx, LOG1,
- FL("received DEAUTH_REQ sessionid %d Systemrole %d reasoncode %u limSmestate %d from "
- MAC_ADDRESS_STR), sme_session_id,
+ pe_debug("received DEAUTH_REQ sessionid %d Systemrole %d reasoncode %u limSmestate %d from "
+ MAC_ADDRESS_STR, sme_session_id,
GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode,
session_entry->limSmeState,
MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes));
@@ -2810,16 +2693,14 @@
* was sent for deauth/disassoc frame.
*/
session_entry->limSmeState = eLIM_SME_WT_DEAUTH_STATE;
- lim_log(mac_ctx, LOG1, FL(
- "Rcvd SME_DEAUTH_REQ while in SME_WT_DEAUTH_STATE"));
+ pe_debug("Rcvd SME_DEAUTH_REQ while in SME_WT_DEAUTH_STATE");
break;
default:
/*
* STA is not in a state to deauthenticate with
* peer. Log error and send response to host.
*/
- lim_log(mac_ctx, LOGE, FL(
- "received unexp SME_DEAUTH_REQ in state %X"),
+ pe_err("received unexp SME_DEAUTH_REQ in state %X",
session_entry->limSmeState);
lim_print_sme_state(mac_ctx, LOGE,
session_entry->limSmeState);
@@ -2854,7 +2735,7 @@
break;
case eLIM_STA_IN_IBSS_ROLE:
- lim_log(mac_ctx, LOGE, FL("Deauth not allowed in IBSS"));
+ pe_err("Deauth not allowed in IBSS");
if (mac_ctx->lim.gLimRspReqd) {
mac_ctx->lim.gLimRspReqd = false;
ret_code = eSIR_SME_INVALID_PARAMETERS;
@@ -2865,8 +2746,7 @@
case eLIM_AP_ROLE:
break;
default:
- lim_log(mac_ctx, LOGE,
- FL("received unexpected SME_DEAUTH_REQ for role %X"),
+ pe_err("received unexpected SME_DEAUTH_REQ for role %X",
GET_LIM_SYSTEM_ROLE(session_entry));
if (mac_ctx->lim.gLimRspReqd) {
mac_ctx->lim.gLimRspReqd = false;
@@ -2879,7 +2759,7 @@
if (sme_deauth_req.reasonCode == eLIM_LINK_MONITORING_DEAUTH) {
/* Deauthentication is triggered by Link Monitoring */
- lim_log(mac_ctx, LOG1, FL("** Lost link with AP **"));
+ pe_debug("** Lost link with AP **");
deauth_trigger = eLIM_LINK_MONITORING_DEAUTH;
reason_code = eSIR_MAC_UNSPEC_FAILURE_REASON;
} else {
@@ -2890,8 +2770,7 @@
/* Trigger Deauthentication frame to peer MAC entity */
mlm_deauth_req = qdf_mem_malloc(sizeof(tLimMlmDeauthReq));
if (NULL == mlm_deauth_req) {
- lim_log(mac_ctx, LOGP,
- FL("call to AllocateMemory failed for mlmDeauthReq"));
+ pe_err("call to AllocateMemory failed for mlmDeauthReq");
if (mac_ctx->lim.gLimRspReqd) {
mac_ctx->lim.gLimRspReqd = false;
ret_code = eSIR_SME_RESOURCES_UNAVAILABLE;
@@ -2942,17 +2821,14 @@
uint8_t sme_session_id;
uint16_t sme_transaction_id;
- lim_log(mac_ctx, LOG1, FL("received SETCONTEXT_REQ message"));
-
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
set_context_req = qdf_mem_malloc(sizeof(struct sSirSmeSetContextReq));
if (NULL == set_context_req) {
- lim_log(mac_ctx, LOGP, FL(
- "call to AllocateMemory failed for set_context_req"));
+ pe_err("call to AllocateMemory failed for set_context_req");
return;
}
qdf_mem_copy(set_context_req, msg_buf,
@@ -2961,15 +2837,13 @@
sme_transaction_id = set_context_req->transactionId;
if ((!lim_is_sme_set_context_req_valid(mac_ctx, set_context_req))) {
- lim_log(mac_ctx, LOGW,
- FL("received invalid SME_SETCONTEXT_REQ message"));
+ pe_warn("received invalid SME_SETCONTEXT_REQ message");
goto end;
}
if (set_context_req->keyMaterial.numKeys >
SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS) {
- lim_log(mac_ctx, LOGE, FL(
- "numKeys:%d is more than SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS"),
+ pe_err("numKeys:%d is more than SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS",
set_context_req->keyMaterial.numKeys);
lim_send_sme_set_context_rsp(mac_ctx,
set_context_req->peer_macaddr, 1,
@@ -2981,8 +2855,7 @@
session_entry = pe_find_session_by_bssid(mac_ctx,
set_context_req->bssid.bytes, &session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGW,
- FL("Session does not exist for given BSSID"));
+ pe_err("Session does not exist for given BSSID");
lim_send_sme_set_context_rsp(mac_ctx,
set_context_req->peer_macaddr, 1,
eSIR_SME_INVALID_PARAMETERS, NULL,
@@ -3002,8 +2875,7 @@
/* Trigger MLM_SETKEYS_REQ */
mlm_set_key_req = qdf_mem_malloc(sizeof(tLimMlmSetKeysReq));
if (NULL == mlm_set_key_req) {
- lim_log(mac_ctx, LOGP, FL(
- "mem alloc failed for mlmSetKeysReq"));
+ pe_err("mem alloc failed for mlmSetKeysReq");
goto end;
}
mlm_set_key_req->edType = set_context_req->keyMaterial.edType;
@@ -3011,8 +2883,7 @@
set_context_req->keyMaterial.numKeys;
if (mlm_set_key_req->numKeys >
SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS) {
- lim_log(mac_ctx, LOGP, FL(
- "no.of keys exceeded max num of default keys limit"));
+ pe_err("no.of keys exceeded max num of default keys limit");
goto end;
}
qdf_copy_macaddr(&mlm_set_key_req->peer_macaddr,
@@ -3026,8 +2897,7 @@
mlm_set_key_req->sessionId = session_id;
mlm_set_key_req->smesessionId = sme_session_id;
- lim_log(mac_ctx, LOG1, FL(
- "received SETCONTEXT_REQ message sessionId=%d"),
+ pe_debug("received SETCONTEXT_REQ message sessionId=%d",
mlm_set_key_req->sessionId);
if (((set_context_req->keyMaterial.edType == eSIR_ED_WEP40) ||
@@ -3055,8 +2925,7 @@
lim_post_mlm_message(mac_ctx, LIM_MLM_SETKEYS_REQ,
(uint32_t *) mlm_set_key_req);
} else {
- lim_log(mac_ctx, LOGE, FL(
- "rcvd unexpected SME_SETCONTEXT_REQ for role %d, state=%X"),
+ pe_err("rcvd unexpected SME_SETCONTEXT_REQ for role %d, state=%X",
GET_LIM_SYSTEM_ROLE(session_entry),
session_entry->limSmeState);
lim_print_sme_state(mac_ctx, LOGE, session_entry->limSmeState);
@@ -3098,7 +2967,7 @@
uint8_t sta_cnt = 0;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -3112,14 +2981,12 @@
get_assoc_stas_req.bssid.bytes,
&session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("session does not exist for given bssId"));
+ pe_err("session does not exist for given bssId");
goto lim_assoc_sta_end;
}
if (!LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOGE, FL(
- "Received unexpected message in state %X, in role %X"),
+ pe_err("Received unexpected message in state %X, in role %X",
session_entry->limSmeState,
GET_LIM_SYSTEM_ROLE(session_entry));
goto lim_assoc_sta_end;
@@ -3151,14 +3018,12 @@
assoc_sta_tmp->Support40Mhz =
sta_ds->htDsssCckRate40MHzSupport;
- lim_log(mac_ctx, LOG1, FL("dph Station Number = %d"),
+ pe_debug("dph Station Number = %d",
sta_cnt + 1);
- lim_log(mac_ctx, LOG1, FL("MAC = " MAC_ADDRESS_STR),
+ pe_debug("MAC = " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(sta_ds->staAddr));
- lim_log(mac_ctx, LOG1, FL("Association Id = %d"),
- sta_ds->assocId);
- lim_log(mac_ctx, LOG1, FL("Station Index = %d"),
- sta_ds->staIndex);
+ pe_debug("Association Id: %d Station Index: %d",
+ sta_ds->assocId, sta_ds->staIndex);
assoc_sta_tmp++;
sta_cnt++;
}
@@ -3202,7 +3067,7 @@
tSap_GetWPSPBCSessionEvent *sap_get_wpspbc_event;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -3218,14 +3083,12 @@
session_entry = pe_find_session_by_bssid(mac_ctx,
get_wps_pbc_sessions_req.bssid.bytes, &session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("session does not exist for given bssId"));
+ pe_err("session does not exist for given bssId");
goto lim_get_wpspbc_sessions_end;
}
if (!LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOGE,
- FL("Received unexpected message in role %X"),
+ pe_err("Received unexpected message in role %X",
GET_LIM_SYSTEM_ROLE(session_entry));
goto lim_get_wpspbc_sessions_end;
}
@@ -3250,8 +3113,7 @@
return;
}
- lim_log(mac_ctx, LOGE, FL("wpsPBCOverlap %d"),
- sap_get_wpspbc_event->wpsPBCOverlap);
+ pe_debug("wpsPBCOverlap %d", sap_get_wpspbc_event->wpsPBCOverlap);
lim_print_mac_addr(mac_ctx,
sap_get_wpspbc_event->addr.bytes, LOG4);
@@ -3304,8 +3166,7 @@
psessionEntry = pe_find_session_by_bssid(pMac,
tkipCntrMeasReq.bssId.bytes, &sessionId);
if (NULL == psessionEntry) {
- lim_log(pMac, LOGE,
- FL("session does not exist for given BSSID "));
+ pe_err("session does not exist for given BSSID");
return;
}
@@ -3333,8 +3194,7 @@
smetransactionId = stopBssReq.transactionId;
if (!lim_is_sme_stop_bss_req_valid(pMsgBuf)) {
- PELOGW(lim_log(pMac, LOGW,
- FL("received invalid SME_STOP_BSS_REQ message"));)
+ pe_warn("received invalid SME_STOP_BSS_REQ message");
/* Send Stop BSS response to host */
lim_send_sme_rsp(pMac, eWNI_SME_STOP_BSS_RSP,
eSIR_SME_INVALID_PARAMETERS, smesessionId,
@@ -3346,8 +3206,7 @@
stopBssReq.bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGW,
- FL("session does not exist for given BSSID "));
+ pe_err("session does not exist for given BSSID");
lim_send_sme_rsp(pMac, eWNI_SME_STOP_BSS_RSP,
eSIR_SME_INVALID_PARAMETERS, smesessionId,
smetransactionId);
@@ -3365,9 +3224,7 @@
* other than 'normal' state or on STA in Infrastructure
* mode. Log error and return response to host.
*/
- lim_log(pMac, LOGE,
- FL
- ("received unexpected SME_STOP_BSS_REQ in state %X, for role %d"),
+ pe_err("received unexpected SME_STOP_BSS_REQ in state %X, for role %d",
psessionEntry->limSmeState,
GET_LIM_SYSTEM_ROLE(psessionEntry));
lim_print_sme_state(pMac, LOGE, psessionEntry->limSmeState);
@@ -3381,8 +3238,7 @@
if (LIM_IS_AP_ROLE(psessionEntry))
lim_wpspbc_close(pMac, psessionEntry);
- lim_log(pMac, LOGW,
- FL("RECEIVED STOP_BSS_REQ with reason code=%d"),
+ pe_debug("RECEIVED STOP_BSS_REQ with reason code=%d",
stopBssReq.reasonCode);
prevState = psessionEntry->limSmeState;
@@ -3440,8 +3296,7 @@
pStaDs->assocId, psessionEntry);
lim_release_peer_idx(pMac, pStaDs->assocId, psessionEntry);
} else {
- lim_log(pMac, LOGE,
- FL("lim_del_sta failed with Status : %d"), status);
+ pe_err("lim_del_sta failed with Status: %d", status);
QDF_ASSERT(0);
}
}
@@ -3449,10 +3304,7 @@
status = lim_del_bss(pMac, NULL, psessionEntry->bssIdx, psessionEntry);
if (status != eSIR_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE, FL("delBss failed for bss %d"),
- psessionEntry->bssIdx);
- )
+ pe_err("delBss failed for bss %d", psessionEntry->bssIdx);
psessionEntry->limSmeState = prevState;
MTRACE(mac_trace
@@ -3531,22 +3383,20 @@
tpSirAssocReq assoc_req;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("msg_buf is NULL "));
+ pe_err("msg_buf is NULL");
goto end;
}
qdf_mem_copy(&assoc_cnf, msg_buf, sizeof(struct sSirSmeAssocCnf));
if (!__lim_is_sme_assoc_cnf_valid(&assoc_cnf)) {
- lim_log(mac_ctx, LOGE,
- FL("Received invalid SME_RE(ASSOC)_CNF message "));
+ pe_err("Received invalid SME_RE(ASSOC)_CNF message");
goto end;
}
session_entry = pe_find_session_by_bssid(mac_ctx, assoc_cnf.bssid.bytes,
&session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("session does not exist for given bssId"));
+ pe_err("session does not exist for given bssId");
goto end;
}
@@ -3554,8 +3404,7 @@
((session_entry->limSmeState != eLIM_SME_NORMAL_STATE) &&
(session_entry->limSmeState !=
eLIM_SME_NORMAL_CHANNEL_SCAN_STATE))) {
- lim_log(mac_ctx, LOGE, FL(
- "Rcvd unexpected msg %X in state %X, in role %X"),
+ pe_err("Rcvd unexpected msg %X in state %X, in role %X",
msg_type, session_entry->limSmeState,
GET_LIM_SYSTEM_ROLE(session_entry));
goto end;
@@ -3563,8 +3412,7 @@
sta_ds = dph_get_hash_entry(mac_ctx, assoc_cnf.aid,
&session_entry->dph.dphHashTable);
if (sta_ds == NULL) {
- lim_log(mac_ctx, LOGE, FL(
- "Rcvd invalid msg %X due to no STA ctx, aid %d, peer "),
+ pe_err("Rcvd invalid msg %X due to no STA ctx, aid %d, peer",
msg_type, assoc_cnf.aid);
lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
@@ -3583,8 +3431,7 @@
if (qdf_mem_cmp((uint8_t *)sta_ds->staAddr,
(uint8_t *) assoc_cnf.peer_macaddr.bytes,
QDF_MAC_ADDR_SIZE)) {
- lim_log(mac_ctx, LOG1, FL(
- "peerMacAddr mismatched for aid %d, peer "),
+ pe_debug("peerMacAddr mismatched for aid %d, peer ",
assoc_cnf.aid);
lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
goto end;
@@ -3595,9 +3442,8 @@
(msg_type != eWNI_SME_ASSOC_CNF)) ||
((sta_ds->mlmStaContext.subType == LIM_REASSOC) &&
(msg_type != eWNI_SME_ASSOC_CNF))) {
- lim_log(mac_ctx, LOG1, FL(
- "not in MLM_WT_ASSOC_CNF_STATE, for aid %d, peer"
- "StaD mlmState : %d"),
+ pe_debug("not in MLM_WT_ASSOC_CNF_STATE, for aid %d, peer"
+ "StaD mlmState: %d",
assoc_cnf.aid, sta_ds->mlmStaContext.mlmState);
lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
goto end;
@@ -3606,7 +3452,7 @@
* Deactivate/delet CNF_WAIT timer since ASSOC_CNF
* has been received
*/
- lim_log(mac_ctx, LOG1, FL("Received SME_ASSOC_CNF. Delete Timer"));
+ pe_debug("Received SME_ASSOC_CNF. Delete Timer");
lim_deactivate_and_change_per_sta_id_timer(mac_ctx,
eLIM_CNF_WAIT_TIMER, sta_ds->assocId);
@@ -3618,8 +3464,7 @@
*/
sta_ds->mlmStaContext.mlmState =
eLIM_MLM_LINK_ESTABLISHED_STATE;
- lim_log(mac_ctx, LOG1,
- FL("sending Assoc Rsp frame to STA (assoc id=%d) "),
+ pe_debug("sending Assoc Rsp frame to STA (assoc id=%d)",
sta_ds->assocId);
lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_SUCCESS,
sta_ds->assocId, sta_ds->staAddr,
@@ -3635,8 +3480,7 @@
*/
if (!sta_ds->mlmStaContext.updateContext)
sta_ds->mlmStaContext.updateContext = 1;
- lim_log(mac_ctx, LOG1,
- FL("Recv Assoc Cnf, status Code : %d(assoc id=%d) "),
+ pe_debug("Recv Assoc Cnf, status Code : %d(assoc id=%d)",
assoc_cnf.statusCode, sta_ds->assocId);
lim_reject_association(mac_ctx, sta_ds->staAddr,
sta_ds->mlmStaContext.subType,
@@ -3671,7 +3515,7 @@
uint16_t smetransactionId;
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -3683,7 +3527,7 @@
psessionEntry = pe_find_session_by_bssid(pMac, pSirAddts->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGE, "Session Does not exist for given bssId");
+ pe_err("Session Does not exist for given bssId");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
NULL, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3700,14 +3544,12 @@
* - wait for addts response from ap
* if ap, just ignore with error log
*/
- PELOG1(lim_log(pMac, LOG1,
- FL("Received SME_ADDTS_REQ (TSid %d, UP %d)"),
- pSirAddts->req.tspec.tsinfo.traffic.tsid,
- pSirAddts->req.tspec.tsinfo.traffic.userPrio);
- )
+ pe_debug("Received SME_ADDTS_REQ (TSid %d, UP %d)",
+ pSirAddts->req.tspec.tsinfo.traffic.tsid,
+ pSirAddts->req.tspec.tsinfo.traffic.userPrio);
if (!LIM_IS_STA_ROLE(psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE, "AddTs received on AP - ignoring");)
+ pe_err("AddTs received on AP - ignoring");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3719,9 +3561,7 @@
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
- PELOGE(lim_log
- (pMac, LOGE, "Cannot find AP context for addts req");
- )
+ pe_err("Cannot find AP context for addts req");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3730,7 +3570,7 @@
if ((!pStaDs->valid) || (pStaDs->mlmStaContext.mlmState !=
eLIM_MLM_LINK_ESTABLISHED_STATE)) {
- lim_log(pMac, LOGE, "AddTs received in invalid MLM state");
+ pe_err("AddTs received in invalid MLM state");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3750,9 +3590,7 @@
else if (pStaDs->lleEnabled)
pSirAddts->req.lleTspecPresent = 1;
else {
- PELOGW(lim_log
- (pMac, LOGW, FL("ADDTS_REQ ignore - qos is disabled"));
- )
+ pe_warn("ADDTS_REQ ignore - qos is disabled");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3761,8 +3599,7 @@
if ((psessionEntry->limSmeState != eLIM_SME_ASSOCIATED_STATE) &&
(psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE)) {
- lim_log(pMac, LOGE,
- "AddTs received in invalid LIMsme state (%d)",
+ pe_err("AddTs received in invalid LIMsme state (%d)",
psessionEntry->limSmeState);
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
@@ -3771,8 +3608,7 @@
}
if (pMac->lim.gLimAddtsSent) {
- lim_log(pMac, LOGE,
- "Addts (token %d, tsid %d, up %d) is still pending",
+ pe_err("Addts (token %d, tsid %d, up %d) is still pending",
pMac->lim.gLimAddtsReq.req.dialogToken,
pMac->lim.gLimAddtsReq.req.tspec.tsinfo.traffic.tsid,
pMac->lim.gLimAddtsReq.req.tspec.tsinfo.traffic.
@@ -3793,14 +3629,13 @@
/* ship out the message now */
lim_send_addts_req_action_frame(pMac, peerMac, &pSirAddts->req,
psessionEntry);
- PELOG1(lim_log(pMac, LOG1, "Sent ADDTS request");)
+ pe_debug("Sent ADDTS request");
/* start a timer to wait for the response */
if (pSirAddts->timeout)
timeout = pSirAddts->timeout;
else if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &timeout) !=
eSIR_SUCCESS) {
- lim_log(pMac, LOGP,
- FL("Unable to get Cfg param %d (Addts Rsp Timeout)"),
+ pe_err("Unable to get Cfg param %d (Addts Rsp Timeout)",
WNI_CFG_ADDTS_RSP_TIMEOUT);
return;
}
@@ -3808,14 +3643,14 @@
timeout = SYS_MS_TO_TICKS(timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAddtsRspTimer, timeout, 0)
!= TX_SUCCESS) {
- lim_log(pMac, LOGP, FL("AddtsRsp timer change failed!"));
+ pe_err("AddtsRsp timer change failed!");
return;
}
pMac->lim.gLimAddtsRspTimerCount++;
if (tx_timer_change_context(&pMac->lim.limTimers.gLimAddtsRspTimer,
pMac->lim.gLimAddtsRspTimerCount) !=
TX_SUCCESS) {
- lim_log(pMac, LOGP, FL("AddtsRsp timer change failed!"));
+ pe_err("AddtsRsp timer change failed!");
return;
}
MTRACE(mac_trace
@@ -3826,7 +3661,7 @@
pMac->lim.limTimers.gLimAddtsRspTimer.sessionId = sessionId;
if (tx_timer_activate(&pMac->lim.limTimers.gLimAddtsRspTimer) !=
TX_SUCCESS) {
- lim_log(pMac, LOGP, FL("AddtsRsp timer activation failed!"));
+ pe_err("AddtsRsp timer activation failed!");
return;
}
return;
@@ -3852,7 +3687,7 @@
pDeltsReq->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGE, "Session Does not exist for given bssId");
+ pe_err("Session Does not exist for given bssId");
status = eSIR_FAILURE;
goto end;
}
@@ -3863,16 +3698,15 @@
if (eSIR_SUCCESS !=
lim_validate_delts_req(pMac, pDeltsReq, peerMacAddr, psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE, FL("lim_validate_delts_req failed"));)
+ pe_err("lim_validate_delts_req failed");
status = eSIR_FAILURE;
lim_send_sme_delts_rsp(pMac, pDeltsReq, eSIR_FAILURE, psessionEntry,
smesessionId, smetransactionId);
return;
}
- lim_log(pMac, LOG1,
- FL("Sent DELTS request to station with assocId = %d MacAddr = "
- MAC_ADDRESS_STR),
+ pe_debug("Sent DELTS request to station with assocId = %d MacAddr = "
+ MAC_ADDRESS_STR,
pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));
lim_send_delts_req_action_frame(pMac, peerMacAddr,
@@ -3925,7 +3759,7 @@
pStaDs->bssId);
status = eSIR_SUCCESS;
} else {
- lim_log(pMac, LOGE, FL("Self entry missing in Hash Table "));
+ pe_err("Self entry missing in Hash Table");
status = eSIR_FAILURE;
}
#ifdef FEATURE_WLAN_ESE
@@ -3946,26 +3780,24 @@
pMac->lim.limTimers.gLimAddtsRspTimer.
sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGP,
- FL("Session Does not exist for given sessionID"));
+ pe_err("Session Does not exist for given sessionID");
return;
}
if (!LIM_IS_STA_ROLE(psessionEntry)) {
- lim_log(pMac, LOGW, "AddtsRspTimeout in non-Sta role (%d)",
+ pe_warn("AddtsRspTimeout in non-Sta role (%d)",
GET_LIM_SYSTEM_ROLE(psessionEntry));
pMac->lim.gLimAddtsSent = false;
return;
}
if (!pMac->lim.gLimAddtsSent) {
- lim_log(pMac, LOGW, "AddtsRspTimeout but no AddtsSent");
+ pe_warn("AddtsRspTimeout but no AddtsSent");
return;
}
if (param != pMac->lim.gLimAddtsRspTimerCount) {
- lim_log(pMac, LOGE,
- FL("Invalid AddtsRsp Timer count %d (exp %d)"), param,
+ pe_err("Invalid AddtsRsp Timer count %d (exp %d)", param,
pMac->lim.gLimAddtsRspTimerCount);
return;
}
@@ -4009,7 +3841,7 @@
if (eSIR_SUCCESS != (wma_post_ctrl_msg(pMac, &msgQ))) {
qdf_mem_free(pMsgBuf);
pMsgBuf = NULL;
- lim_log(pMac, LOGP, "Unable to forward request");
+ pe_err("Unable to forward request");
return;
}
@@ -4039,7 +3871,7 @@
if (eSIR_SUCCESS != (wma_post_ctrl_msg(pMac, &msgQ))) {
qdf_mem_free(pMsgBuf);
pMsgBuf = NULL;
- lim_log(pMac, LOGP, "Unable to forward request");
+ pe_err("Unable to forward request");
return;
}
}
@@ -4052,18 +3884,16 @@
tpPESession psessionEntry;
uint8_t sessionId; /* PE sessionID */
- PELOG1(lim_log(pMac, LOG1, FL("received UPDATE_APWPSIEs_REQ message")););
+ pe_debug("received UPDATE_APWPSIEs_REQ message");
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
pUpdateAPWPSIEsReq = qdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq));
if (NULL == pUpdateAPWPSIEsReq) {
- lim_log(pMac, LOGP,
- FL
- ("call to AllocateMemory failed for pUpdateAPWPSIEsReq"));
+ pe_err("call to AllocateMemory failed for pUpdateAPWPSIEsReq");
return;
}
qdf_mem_copy(pUpdateAPWPSIEsReq, pMsgBuf,
@@ -4073,8 +3903,7 @@
pUpdateAPWPSIEsReq->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGW,
- FL("Session does not exist for given BSSID"));
+ pe_warn("Session does not exist for given BSSID");
goto end;
}
@@ -4098,20 +3927,14 @@
tSirRetStatus retCode = eSIR_SUCCESS;
if (psessionEntry == NULL) {
- PELOGE(lim_log
- (pMac, LOGE, "%s:%d: Invalid parameters", __func__,
- __LINE__);
- )
+ pe_err("Invalid parameters");
return;
}
pHalHiddenSsidVdevRestart =
qdf_mem_malloc(sizeof(tHalHiddenSsidVdevRestart));
if (NULL == pHalHiddenSsidVdevRestart) {
- PELOGE(lim_log
- (pMac, LOGE, "%s:%d: Unable to allocate memory",
- __func__, __LINE__);
- )
+ pe_err("Unable to allocate memory");
return;
}
@@ -4124,10 +3947,7 @@
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
- PELOGE(lim_log
- (pMac, LOGE, "%s:%d: wma_post_ctrl_msg() failed", __func__,
- __LINE__);
- )
+ pe_err("wma_post_ctrl_msg() failed");
qdf_mem_free(pHalHiddenSsidVdevRestart);
}
}
@@ -4155,8 +3975,7 @@
local_ie_buf = qdf_mem_malloc(MAX_DEFAULT_SCAN_IE_LEN);
if (!local_ie_buf) {
- lim_log(mac_ctx, LOGE,
- FL("Mem Alloc failed for local_ie_buf"));
+ pe_err("Mem Alloc failed for local_ie_buf");
qdf_mem_free(req_buffer);
return;
}
@@ -4180,8 +3999,7 @@
status = wma_post_ctrl_msg(mac_ctx, &wma_msg);
if (eSIR_SUCCESS != status) {
- lim_log(mac_ctx, LOGE,
- FL("Posting WMA_ROAM_SCAN_OFFLOAD_REQ failed"));
+ pe_err("Posting WMA_ROAM_SCAN_OFFLOAD_REQ failed");
qdf_mem_free(req_buffer);
}
}
@@ -4198,7 +4016,9 @@
static void lim_handle_update_ssid_hidden(tpAniSirGlobal mac_ctx,
tpPESession session, uint8_t ssid_hidden)
{
- lim_log(mac_ctx, LOG1, FL("received HIDE_SSID message"));
+ pe_debug("received HIDE_SSID message old HIDE_SSID: %d new HIDE_SSID: %d",
+ session->ssidHidden, ssid_hidden);
+
if (ssid_hidden != session->ssidHidden)
session->ssidHidden = ssid_hidden;
else {
@@ -4231,7 +4051,7 @@
tpPESession session;
if (!msg_buf) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -4239,13 +4059,12 @@
session = pe_find_session_by_sme_session_id(mac_ctx, msg->session_id);
if (!session) {
- lim_log(mac_ctx, LOGW,
- "Session does not exist for given sessionId %d",
+ pe_warn("Session does not exist for given sessionId %d",
msg->session_id);
return;
}
- lim_log(mac_ctx, LOG1, FL("received SME Session update for %d val %d"),
+ pe_debug("received SME Session update for %d val %d",
msg->param_type, msg->param_val);
switch (msg->param_type) {
case SIR_PARAM_SSID_HIDDEN:
@@ -4255,7 +4074,7 @@
session->ignore_assoc_disallowed = msg->param_val;
break;
default:
- lim_log(mac_ctx, LOGE, FL("Unknown session param"));
+ pe_err("Unknown session param");
break;
}
}
@@ -4267,15 +4086,13 @@
uint8_t sessionId; /* PE sessionID */
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
pUpdateAPWPARSNIEsReq = qdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq));
if (NULL == pUpdateAPWPARSNIEsReq) {
- lim_log(pMac, LOGP,
- FL
- ("call to AllocateMemory failed for pUpdateAPWPARSNIEsReq"));
+ pe_err("call to AllocateMemory failed for pUpdateAPWPARSNIEsReq");
return;
}
qdf_mem_copy(pUpdateAPWPARSNIEsReq, pMsgBuf,
@@ -4285,8 +4102,7 @@
pUpdateAPWPARSNIEsReq->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGW,
- FL("Session does not exist for given BSSID"));
+ pe_warn("Session does not exist for given BSSID");
goto end;
}
@@ -4319,12 +4135,10 @@
uint8_t sessionId = 0;
tUpdateBeaconParams beaconParams;
- PELOG1(lim_log(pMac, LOG1,
- FL("received Update Beacon Interval message"));
- );
+ pe_debug("received Update Beacon Interval message");
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -4335,8 +4149,7 @@
pChangeBIParams->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGE,
- FL("Session does not exist for given BSSID"));
+ pe_err("Session does not exist for given BSSID");
return;
}
@@ -4353,11 +4166,8 @@
pMac->sch.schObject.gSchBeaconInterval =
pChangeBIParams->beaconInterval;
- PELOG1(lim_log(pMac, LOG1,
- FL
- ("LIM send update BeaconInterval Indication : %d"),
- pChangeBIParams->beaconInterval);
- );
+ pe_debug("LIM send update BeaconInterval Indication: %d",
+ pChangeBIParams->beaconInterval);
if (false == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running) {
/* Update beacon */
@@ -4388,9 +4198,9 @@
uint16_t staId = 0;
tpDphHashNode pStaDs = NULL;
- PELOG1(lim_log(pMac, LOG1, FL("received Set HT 20/40 mode message")););
+ pe_debug("received Set HT 20/40 mode message");
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -4400,13 +4210,12 @@
pSetHT2040Mode->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOG1,
- FL("Session does not exist for given BSSID "));
- lim_print_mac_addr(pMac, pSetHT2040Mode->bssid.bytes, LOG1);
+ pe_debug("Session does not exist for given BSSID");
+ lim_print_mac_addr(pMac, pSetHT2040Mode->bssid.bytes, LOGD);
return;
}
- lim_log(pMac, LOG1, FL("Update session entry for cbMod=%d"),
+ pe_debug("Update session entry for cbMod=%d",
pSetHT2040Mode->cbMode);
/*Update sessionEntry HT related fields */
switch (pSetHT2040Mode->cbMode) {
@@ -4432,7 +4241,7 @@
psessionEntry->htRecommendedTxWidthSet = 1;
break;
default:
- lim_log(pMac, LOGE, FL("Invalid cbMode"));
+ pe_err("Invalid cbMode");
return;
}
@@ -4450,10 +4259,7 @@
if (pStaDs->valid && pStaDs->htSupportedChannelWidthSet) {
pHtOpMode = qdf_mem_malloc(sizeof(tUpdateVHTOpMode));
if (NULL == pHtOpMode) {
- lim_log(pMac, LOGE,
- FL
- ("%s: Not able to allocate memory for setting OP mode"),
- __func__);
+ pe_err("Not able to allocate memory for setting OP mode");
return;
}
pHtOpMode->opMode =
@@ -4468,25 +4274,17 @@
msg.type = WMA_UPDATE_OP_MODE;
msg.reserved = 0;
msg.bodyptr = pHtOpMode;
- if (!QDF_IS_STATUS_SUCCESS(
- scheduler_post_msg(QDF_MODULE_ID_WMA,
- &msg))) {
- lim_log(pMac, LOGE,
- FL
- ("%s: Not able to post WMA_UPDATE_OP_MODE message to WMA"),
- __func__);
+ if (!QDF_IS_STATUS_SUCCESS
+ (scheduler_post_msg(QDF_MODULE_ID_WMA, &msg))) {
+ pe_err("Not able to post WMA_UPDATE_OP_MODE message to WMA");
qdf_mem_free(pHtOpMode);
return;
}
- lim_log(pMac, LOG1,
- FL
- ("%s: Notifed FW about OP mode: %d for staId=%d"),
- __func__, pHtOpMode->opMode, staId);
+ pe_debug("Notifed FW about OP mode: %d for staId=%d",
+ pHtOpMode->opMode, staId);
} else
- lim_log(pMac, LOG1,
- FL("%s: station %d does not support HT40\n"),
- __func__, staId);
+ pe_debug("station %d does not support HT40", staId);
}
return;
@@ -4520,7 +4318,7 @@
rrm_process_beacon_report_xmit(pMac, pMsg->bodyptr);
break;
default:
- lim_log(pMac, LOGE, FL("Invalid msg type:%d"), pMsg->type);
+ pe_err("Invalid msg type: %d", pMsg->type);
}
}
@@ -4549,14 +4347,13 @@
struct scheduler_msg msgQ = {0};
if (pSessionEntry == NULL) {
- lim_log(pMac, LOGE, FL("Inavalid parameters"));
+ pe_err("Invalid parameters");
return eSIR_FAILURE;
}
pMaxTxParams = qdf_mem_malloc(sizeof(tMaxTxPowerParams));
if (NULL == pMaxTxParams) {
- lim_log(pMac, LOGP,
- FL("Unable to allocate memory for pMaxTxParams "));
+ pe_err("Unable to allocate memory for pMaxTxParams");
return eSIR_MEM_ALLOC_FAILED;
}
@@ -4570,11 +4367,11 @@
msgQ.type = WMA_SET_MAX_TX_POWER_REQ;
msgQ.bodyptr = pMaxTxParams;
msgQ.bodyval = 0;
- lim_log(pMac, LOG1, FL("Post WMA_SET_MAX_TX_POWER_REQ to WMA"));
+ pe_debug("Post WMA_SET_MAX_TX_POWER_REQ to WMA");
MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
- lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() failed"));
+ pe_err("wma_post_ctrl_msg() failed");
qdf_mem_free(pMaxTxParams);
}
return retCode;
@@ -4600,8 +4397,7 @@
struct mgmt_frm_reg_info *next = NULL;
bool match = false;
- lim_log(mac_ctx, LOG1, FL(
- "registerFrame %d, frameType %d, matchLen %d"),
+ pe_debug("registerFrame %d, frameType %d, matchLen %d",
sme_req->registerFrame, sme_req->frameType,
sme_req->matchLen);
/* First check whether entry exists already */
@@ -4674,8 +4470,7 @@
static void __lim_deregister_deferred_sme_req_after_noa_start(tpAniSirGlobal pMac)
{
- lim_log(pMac, LOG1, FL("Dereg msgType %d"),
- pMac->lim.gDeferMsgTypeForNOA);
+ pe_debug("Dereg msgType %d", pMac->lim.gDeferMsgTypeForNOA);
pMac->lim.gDeferMsgTypeForNOA = 0;
if (pMac->lim.gpDefdSmeMsgForNOA != NULL) {
/* __lim_process_sme_scan_req consumed the buffer. We can free it. */
@@ -4698,15 +4493,13 @@
{
bool buf_consumed = true;
- lim_log(mac_ctx, LOG1, FL("Process defd sme req %d"),
+ pe_debug("Process defd sme req %d",
mac_ctx->lim.gDeferMsgTypeForNOA);
if ((mac_ctx->lim.gDeferMsgTypeForNOA == 0) ||
(mac_ctx->lim.gpDefdSmeMsgForNOA == NULL)) {
- lim_log(mac_ctx, LOGW,
- FL("start rcvd from FW when no sme deferred msg pending. Do nothing. "));
- lim_log(mac_ctx, LOGW,
- FL("It may happen when NOA start ind and timeout happen at the same time"));
+ pe_warn("start rcvd from FW when no sme deferred msg pending. Do nothing");
+ pe_warn("It may happen when NOA start ind and timeout happen at the same time");
return;
}
switch (mac_ctx->lim.gDeferMsgTypeForNOA) {
@@ -4730,7 +4523,7 @@
mac_ctx->lim.gpDefdSmeMsgForNOA);
break;
default:
- lim_log(mac_ctx, LOGE, FL("Unknown deferred msg type %d"),
+ pe_err("Unknown deferred msg type %d",
mac_ctx->lim.gDeferMsgTypeForNOA);
break;
}
@@ -4744,7 +4537,7 @@
tpPESession psessionEntry;
uint8_t sessionId = 0;
if (pMsgBuf == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -4753,8 +4546,7 @@
pe_find_session_by_bssid(pMac, pResetCapsChange->bssId.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGE,
- FL("Session does not exist for given BSSID"));
+ pe_err("Session does not exist for given BSSID");
return;
}
@@ -4778,14 +4570,14 @@
(struct sir_sme_p2p_ack_ind_cb_req *)msg_buf;
if (NULL == msg_buf) {
- lim_log(mac_ctx, LOGE, FL("msg_buf is null"));
+ pe_err("msg_buf is null");
return;
}
if (sme_req->callback)
mac_ctx->p2p_ack_ind_cb =
sme_req->callback;
else
- lim_log(mac_ctx, LOGE, FL("sme_req->callback is null"));
+ pe_err("sme_req->callback is null");
}
/**
@@ -4806,14 +4598,14 @@
(struct sir_sme_mgmt_frame_cb_req *)msg_buf;
if (NULL == msg_buf) {
- lim_log(mac_ctx, LOGE, FL("msg_buf is null"));
+ pe_err("msg_buf is null");
return;
}
if (sme_req->callback)
mac_ctx->mgmt_frame_ind_cb =
(sir_mgmt_frame_ind_callback)sme_req->callback;
else
- lim_log(mac_ctx, LOGE, FL("sme_req->callback is null"));
+ pe_err("sme_req->callback is null");
}
/**
@@ -4835,7 +4627,7 @@
uint16_t sme_trans_id;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -4849,22 +4641,19 @@
if ((eSIR_FAILURE == status) ||
(lim_is_group_addr(sme_send_disassoc_frame_req.peer_mac) &&
!lim_is_addr_bc(sme_send_disassoc_frame_req.peer_mac))) {
- PELOGE(lim_log(mac_ctx, LOGE,
- FL("received invalid SME_DISASSOC_REQ message"));)
+ pe_err("received invalid SME_DISASSOC_REQ message");
return;
}
session_entry = pe_find_session_by_sme_session_id(
mac_ctx, sme_session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE,
- FL("session does not exist for given bssId "MAC_ADDRESS_STR),
+ pe_err("session does not exist for given bssId "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(sme_send_disassoc_frame_req.peer_mac));
return;
}
- lim_log(mac_ctx, LOG1,
- FL("msg_type->%d len->%d sess_id->%d trans_id->%d mac->"MAC_ADDRESS_STR" reason->%d wait_for_ack->%d"),
+ pe_debug("msg_type->%d len->%d sess_id->%d trans_id->%d mac->"MAC_ADDRESS_STR" reason->%d wait_for_ack->%d",
sme_send_disassoc_frame_req.msg_type,
sme_send_disassoc_frame_req.length,
sme_send_disassoc_frame_req.session_id,
@@ -4903,7 +4692,7 @@
for (i = 1; i <= nss; i++) {
ie_params = qdf_mem_malloc(sizeof(*ie_params));
if (NULL == ie_params) {
- lim_log(mac_ctx, LOGE, FL("mem alloc failed"));
+ pe_err("mem alloc failed");
return;
}
ie_params->nss = i;
@@ -4914,7 +4703,7 @@
ie_params->ie_ptr = qdf_mem_malloc(ie_params->ie_len);
if (NULL == ie_params->ie_ptr) {
qdf_mem_free(ie_params);
- lim_log(mac_ctx, LOGE, FL("mem alloc failed"));
+ pe_err("mem alloc failed");
return;
}
*ie_params->ie_ptr = SIR_MAC_HT_CAPABILITIES_EID;
@@ -4929,8 +4718,7 @@
if (NULL == p_ie) {
qdf_mem_free(ie_params->ie_ptr);
qdf_mem_free(ie_params);
- lim_log(mac_ctx, LOGE,
- FL("failed to get IE ptr"));
+ pe_err("failed to get IE ptr");
return;
}
p_ht_cap = (tHtCaps *)&p_ie[2];
@@ -4944,8 +4732,7 @@
rc = wma_post_ctrl_msg(mac_ctx, &msg);
if (rc != eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGE,
- FL("wma_post_ctrl_msg() return failure"));
+ pe_err("wma_post_ctrl_msg() return failure");
qdf_mem_free(ie_params->ie_ptr);
qdf_mem_free(ie_params);
return;
@@ -4978,7 +4765,7 @@
for (i = 1; i <= nss; i++) {
ie_params = qdf_mem_malloc(sizeof(*ie_params));
if (NULL == ie_params) {
- lim_log(mac_ctx, LOGE, FL("mem alloc failed"));
+ pe_err("mem alloc failed");
return;
}
ie_params->nss = i;
@@ -4990,7 +4777,7 @@
ie_params->ie_ptr = qdf_mem_malloc(ie_params->ie_len);
if (NULL == ie_params->ie_ptr) {
qdf_mem_free(ie_params);
- lim_log(mac_ctx, LOGE, FL("mem alloc failed"));
+ pe_err("mem alloc failed");
return;
}
*ie_params->ie_ptr = SIR_MAC_VHT_CAPABILITIES_EID;
@@ -5005,8 +4792,7 @@
if (NULL == p_ie) {
qdf_mem_free(ie_params->ie_ptr);
qdf_mem_free(ie_params);
- lim_log(mac_ctx, LOGE,
- FL("failed to get IE ptr"));
+ pe_err("failed to get IE ptr");
return;
}
vht_cap = (tSirMacVHTCapabilityInfo *)&p_ie[2];
@@ -5027,8 +4813,7 @@
rc = wma_post_ctrl_msg(mac_ctx, &msg);
if (rc != eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGE,
- FL("wma_post_ctrl_msg failure"));
+ pe_err("wma_post_ctrl_msg failure");
qdf_mem_free(ie_params->ie_ptr);
qdf_mem_free(ie_params);
return;
@@ -5053,16 +4838,16 @@
(struct sir_set_vdev_ies_per_band *)msg_buf;
if (NULL == p_msg) {
- lim_log(mac_ctx, LOGE, FL("NULL p_msg"));
+ pe_err("NULL p_msg");
return;
}
- lim_log(mac_ctx, LOG1, FL("rcvd set vdev ie per band req vdev_id = %d"),
+ pe_debug("rcvd set vdev ie per band req vdev_id = %d",
p_msg->vdev_id);
/* intentionally using NULL here so that self capabilty are sent */
if (lim_send_ies_per_band(mac_ctx, NULL, p_msg->vdev_id) !=
QDF_STATUS_SUCCESS)
- lim_log(mac_ctx, LOGE, FL("Unable to send HT/VHT/HE IE to FW"));
+ pe_err("Unable to send HT/VHT Cap to FW");
}
/**
@@ -5082,11 +4867,11 @@
ht_vht_cfg = (struct sir_set_ht_vht_cfg *)msg_buf;
if (NULL == ht_vht_cfg) {
- lim_log(mac_ctx, LOGE, FL("NULL ht_vht_cfg"));
+ pe_err("NULL ht_vht_cfg");
return;
}
- lim_log(mac_ctx, LOG1, FL("rcvd set pdev ht vht ie req with nss = %d"),
+ pe_debug("rcvd set pdev ht vht ie req with nss = %d",
ht_vht_cfg->nss);
lim_set_pdev_ht_ie(mac_ctx, ht_vht_cfg->pdev_id, ht_vht_cfg->nss);
@@ -5117,7 +4902,7 @@
uint8_t num_bytes;
if (!msg) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
update_vendor_ie = (struct sme_update_access_policy_vendor_ie *) msg;
@@ -5125,8 +4910,7 @@
update_vendor_ie->sme_session_id);
if (!pe_session_entry) {
- lim_log(mac_ctx, LOGE,
- FL("Session does not exist for given sme session id(%hu)"),
+ pe_err("Session does not exist for given sme session id(%hu)",
update_vendor_ie->sme_session_id);
return;
}
@@ -5137,8 +4921,7 @@
pe_session_entry->access_policy_vendor_ie = qdf_mem_malloc(num_bytes);
if (!pe_session_entry->access_policy_vendor_ie) {
- lim_log(mac_ctx, LOGE,
- FL("Failed to allocate memory for vendor ie"));
+ pe_err("Failed to allocate memory for vendor ie");
return;
}
qdf_mem_copy(pe_session_entry->access_policy_vendor_ie,
@@ -5174,14 +4957,11 @@
bool bufConsumed = true; /* Set this flag to false within case block of any following message, that doesnt want pMsgBuf to be freed. */
uint32_t *pMsgBuf = pMsg->bodyptr;
tpSirSmeScanReq pScanReq;
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("LIM Received SME Message %s(%d) Global LimSmeState:%s(%d) Global LimMlmState: %s(%d)"),
+
+ pe_debug("LIM Received SME Message %s(%d) Global LimSmeState:%s(%d) Global LimMlmState: %s(%d)",
lim_msg_str(pMsg->type), pMsg->type,
lim_sme_state_str(pMac->lim.gLimSmeState), pMac->lim.gLimSmeState,
lim_mlm_state_str(pMac->lim.gLimMlmState), pMac->lim.gLimMlmState);
- )
pScanReq = (tpSirSmeScanReq) pMsgBuf;
/* If no insert NOA required then execute the code below */
@@ -5445,7 +5225,7 @@
uint8_t sessionId; /* PE sessionID */
if (pMsg == NULL) {
- lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -5455,8 +5235,7 @@
&sessionId);
if (psessionEntry == NULL) {
lim_print_mac_addr(pMac, pBeaconStartInd->bssid, LOGE);
- lim_log(pMac, LOGE,
- FL("Session does not exist for given bssId"));
+ pe_err("Session does not exist for given bssId");
return;
}
@@ -5476,7 +5255,7 @@
psessionEntry->currentOperChannel);
lim_send_beacon_ind(pMac, psessionEntry);
} else {
- lim_log(pMac, LOGE, FL("Invalid Beacon Start Indication"));
+ pe_err("Invalid Beacon Start Indication");
return;
}
}
@@ -5501,7 +5280,7 @@
uint32_t val = 0;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("msg_buf is NULL"));
+ pe_err("msg_buf is NULL");
return;
}
ch_change_req = (tpSirChanChangeRequest)msg_buf;
@@ -5511,7 +5290,7 @@
if ((ch_change_req->messageType != eWNI_SME_CHANNEL_CHANGE_REQ) ||
(max_tx_pwr == WMA_MAX_TXPOWER_INVALID)) {
- lim_log(mac_ctx, LOGE, FL("Invalid Request/max_tx_pwr"));
+ pe_err("Invalid Request/max_tx_pwr");
return;
}
@@ -5519,14 +5298,13 @@
ch_change_req->bssid, &session_id);
if (session_entry == NULL) {
lim_print_mac_addr(mac_ctx, ch_change_req->bssid, LOGE);
- lim_log(mac_ctx, LOGE, FL(
- "Session does not exist for given bssId"));
+ pe_err("Session does not exist for given bssId");
return;
}
if (session_entry->currentOperChannel ==
ch_change_req->targetChannel) {
- lim_log(mac_ctx, LOGE, FL("target CH is same as current CH"));
+ pe_err("target CH is same as current CH");
return;
}
@@ -5537,8 +5315,7 @@
session_entry->channelChangeReasonCode =
LIM_SWITCH_CHANNEL_OPERATION;
- lim_log(mac_ctx, LOGW, FL(
- "switch old chnl %d to new chnl %d, ch_bw %d"),
+ pe_debug("switch old chnl %d to new chnl %d, ch_bw %d",
session_entry->currentOperChannel,
ch_change_req->targetChannel,
ch_change_req->ch_width);
@@ -5562,8 +5339,7 @@
if (SIR_BAND_5_GHZ == session_entry->limRFBand) {
if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11H_ENABLED, &val) !=
eSIR_SUCCESS)
- lim_log(mac_ctx, LOGP,
- FL("Fail to get WNI_CFG_11H_ENABLED"));
+ pe_err("Fail to get WNI_CFG_11H_ENABLED");
}
session_entry->lim11hEnable = val;
@@ -5616,8 +5392,7 @@
*pDstData_buff = qdf_mem_malloc(*pDstDataLen);
if (NULL == *pDstData_buff) {
- lim_log(pMac, LOGE,
- FL("AllocateMemory failed for pDstData_buff"));
+ pe_err("AllocateMemory failed for pDstData_buff");
return;
}
qdf_mem_copy(*pDstData_buff, pSrcData_buff, *pDstDataLen);
@@ -5657,7 +5432,7 @@
{
if (NULL == pSrcData_buff) {
- lim_log(pMac, LOGE, FL("src buffer is null."));
+ pe_err("src buffer is null");
return;
}
@@ -5669,7 +5444,7 @@
*pDstData_buff = qdf_mem_malloc(*pDstDataLen);
if (NULL == *pDstData_buff) {
- lim_log(pMac, LOGE, FL("Memory allocation failed."));
+ pe_err("Memory allocation failed");
*pDstDataLen = 0;
return;
}
@@ -5708,9 +5483,8 @@
oui_length = pModifyIE->oui_length;
if ((0 == oui_length) || (NULL == ibss_ie)) {
- PELOGE(lim_log(pMac, LOGE,
- FL("Invalid set IBSS vendor IE command length %d "),
- oui_length);)
+ pe_err("Invalid set IBSS vendor IE command length %d",
+ oui_length);
return false;
}
@@ -5731,7 +5505,7 @@
uint8_t *new_ptr = qdf_mem_malloc(new_length);
if (NULL == new_ptr) {
- lim_log(pMac, LOGE, FL("Memory allocation failed."));
+ pe_err("Memory allocation failed");
return false;
}
qdf_mem_copy(new_ptr, *pDstData_buff, *pDstDataLen);
@@ -5764,7 +5538,7 @@
tSirAddIeParams *add_ie_params;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("msg_buf is NULL"));
+ pe_err("msg_buf is NULL");
return;
}
@@ -5774,16 +5548,15 @@
modify_add_ies->modifyIE.bssid.bytes, &session_id);
if (NULL == session_entry) {
- lim_log(mac_ctx, LOGE, FL("Session not found for given bssid. "
- MAC_ADDRESS_STR),
+ pe_err("Session not found for given bssid"
+ MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes));
goto end;
}
if ((0 == modify_add_ies->modifyIE.ieBufferlength) ||
(0 == modify_add_ies->modifyIE.ieIDLen) ||
(NULL == modify_add_ies->modifyIE.pIEBuffer)) {
- lim_log(mac_ctx, LOGE,
- FL("Invalid request pIEBuffer %p ieBufferlength %d ieIDLen %d ieID %d. update Type %d"),
+ pe_err("Invalid request pIEBuffer %p ieBufferlength %d ieIDLen %d ieID %d. update Type %d",
modify_add_ies->modifyIE.pIEBuffer,
modify_add_ies->modifyIE.ieBufferlength,
modify_add_ies->modifyIE.ieID,
@@ -5826,7 +5599,7 @@
}
break;
default:
- lim_log(mac_ctx, LOGE, FL("unhandled buffer type %d"),
+ pe_err("unhandled buffer type %d",
modify_add_ies->updateType);
break;
}
@@ -5857,7 +5630,7 @@
tSirUpdateIE *update_ie;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("msg_buf is NULL"));
+ pe_err("msg_buf is NULL");
return;
}
update_ie = &update_add_ies->updateIE;
@@ -5866,8 +5639,8 @@
update_ie->bssid.bytes, &session_id);
if (NULL == session_entry) {
- lim_log(mac_ctx, LOGE, FL("Session not found for given bssid. "
- MAC_ADDRESS_STR),
+ pe_err("Session not found for given bssid"
+ MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(update_ie->bssid.bytes));
goto end;
}
@@ -5910,8 +5683,7 @@
addn_ie->probeRespDataLen;
new_ptr = qdf_mem_malloc(new_length);
if (NULL == new_ptr) {
- lim_log(mac_ctx, LOGE, FL(
- "Memory allocation failed."));
+ pe_err("Memory allocation failed");
goto end;
}
/* append buffer to end of local buffers */
@@ -5952,8 +5724,7 @@
update_add_ies->updateType);
break;
default:
- lim_log(mac_ctx, LOGE, FL("unhandled buffer type %d."),
- update_add_ies->updateType);
+ pe_err("unhandled buffer type %d", update_add_ies->updateType);
break;
}
end:
@@ -6034,7 +5805,7 @@
enum offset_t ch_offset;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -6042,14 +5813,13 @@
session_entry = pe_find_session_by_bssid(mac_ctx,
dfs_csa_ie_req->bssid, &session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE, FL(
- "Session not found for given BSSID" MAC_ADDRESS_STR),
+ pe_err("Session not found for given BSSID" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(dfs_csa_ie_req->bssid));
return;
}
if (session_entry->valid && !LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOGE, FL("Invalid SystemRole %d"),
+ pe_err("Invalid SystemRole %d",
GET_LIM_SYSTEM_ROLE(session_entry));
return;
}
@@ -6123,7 +5893,7 @@
* Need to handle 80+80 Mhz Scenario. When 80+80 is supported
* set the gLimWiderBWChannelSwitch.newChanWidth to 3
*/
- lim_log(mac_ctx, LOGE, FL("Invalid Channel Width"));
+ pe_err("Invalid Channel Width");
break;
}
/* Fetch the center channel based on the channel width */
@@ -6133,7 +5903,7 @@
/* Send CSA IE request from here */
if (sch_set_fixed_beacon_fields(mac_ctx, session_entry) !=
eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGE, FL("Unable to set CSA IE in beacon"));
+ pe_err("Unable to set CSA IE in beacon");
return;
}
@@ -6149,7 +5919,7 @@
else
ch_offset = dfs_csa_ie_req->ch_params.sec_ch_offset;
- lim_log(mac_ctx, LOG1, FL("IE count:%d chan:%d width:%d wrapper:%d ch_offset:%d"),
+ pe_debug("IE count:%d chan:%d width:%d wrapper:%d ch_offset:%d",
session_entry->gLimChannelSwitch.switchCount,
session_entry->gLimChannelSwitch.primaryChannel,
session_entry->gLimChannelSwitch.ch_width,
@@ -6182,21 +5952,19 @@
tpPESession session_entry = NULL;
if (NULL == msg) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
session_entry =
pe_find_session_by_sme_session_id(mac_ctx,
ext_chng_channel->session_id);
if (NULL == session_entry) {
- lim_log(mac_ctx, LOGE,
- FL("Session not found for given session %d"),
+ pe_err("Session not found for given session %d",
ext_chng_channel->session_id);
return;
}
if (LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOGE,
- FL("not an STA/CLI session"));
+ pe_err("not an STA/CLI session");
return;
}
send_extended_chan_switch_action_frame(mac_ctx,
@@ -6222,7 +5990,7 @@
tpPESession session_entry = NULL;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
@@ -6230,14 +5998,13 @@
session_entry = pe_find_session_by_sme_session_id(mac_ctx,
nss_update_req_ptr->vdev_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGE, FL(
- "Session not found for given session_id %d"),
+ pe_err("Session not found for given session_id %d",
nss_update_req_ptr->vdev_id);
return;
}
if (session_entry->valid && !LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOGE, FL("Invalid SystemRole %d"),
+ pe_err("Invalid SystemRole %d",
GET_LIM_SYSTEM_ROLE(session_entry));
return;
}
@@ -6248,8 +6015,7 @@
/* Send nss update request from here */
if (sch_set_fixed_beacon_fields(mac_ctx, session_entry) !=
eSIR_SUCCESS) {
- lim_log(mac_ctx, LOGE,
- FL("Unable to set op mode IE in beacon"));
+ pe_err("Unable to set op mode IE in beacon");
return;
}
@@ -6273,13 +6039,13 @@
QDF_STATUS status;
if (msg_buf == NULL) {
- lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
+ pe_err("Buffer is Pointing to NULL");
return;
}
msg = (struct send_extcap_ie *)msg_buf;
status = lim_send_ext_cap_ie(mac_ctx, msg->session_id, NULL, false);
if (QDF_STATUS_SUCCESS != status)
- lim_log(mac_ctx, LOGE, FL("Unable to send ExtCap to FW"));
+ pe_err("Unable to send ExtCap to FW");
}