summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Girigowda <sgirigow@codeaurora.org>2017-03-26 15:26:27 -0700
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-31 16:00:13 -0700
commitdd322d30c32332b0604fe45b9ac442793db2d6dc (patch)
tree28ac1b21ce7e653898b9a6ebf488db71cf750e43
parent14a9e0695f9ad0078e1e7f0069f7e211d1566314 (diff)
qcacld-3.0: Replace lim_log() with pe_* log levels in lim_security_utils.c
Replace lim_log() with pe_* appropriate log levels in lim_security_utils.c Change-Id: I4b52da67bd09af2719144cf501d89a11bafc5201 CRs-Fixed: 1093093
-rw-r--r--core/mac/src/pe/lim/lim_security_utils.c63
1 files changed, 17 insertions, 46 deletions
diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c
index 159a76c5fae2..4aa0c61d6f17 100644
--- a/core/mac/src/pe/lim/lim_security_utils.c
+++ b/core/mac/src/pe/lim/lim_security_utils.c
@@ -97,12 +97,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal pMac, tAniAuthType authType,
if (wlan_cfg_get_int(pMac, WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE,
&algoEnable) != eSIR_SUCCESS) {
- /**
- * Could not get AuthAlgo1 Enable value
- * from CFG. Log error.
- */
- lim_log(pMac, LOGE,
- FL("could not retrieve AuthAlgo1 Enable value"));
+ pe_err("could not retrieve AuthAlgo1 Enable value");
return false;
} else
@@ -121,12 +116,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal pMac, tAniAuthType authType,
if (wlan_cfg_get_int
(pMac, WNI_CFG_SHARED_KEY_AUTH_ENABLE,
&algoEnable) != eSIR_SUCCESS) {
- /**
- * Could not get AuthAlgo2 Enable value
- * from CFG. Log error.
- */
- lim_log(pMac, LOGE,
- FL("could not retrieve AuthAlgo2 Enable value"));
+ pe_err("could not retrieve AuthAlgo2 Enable value");
return false;
}
@@ -137,13 +127,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal pMac, tAniAuthType authType,
if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED,
&privacyOptImp) != eSIR_SUCCESS) {
- /**
- * Could not get PrivacyOptionImplemented value
- * from CFG. Log error.
- */
- lim_log(pMac, LOGE,
- FL
- ("could not retrieve PrivacyOptImplemented value"));
+ pe_err("could not retrieve PrivacyOptImplemented value");
return false;
}
@@ -200,8 +184,6 @@ void lim_delete_pre_auth_list(tpAniSirGlobal pMac)
pCurrNode = pTempNode = pMac->lim.pLimPreAuthList;
while (pCurrNode != NULL) {
pTempNode = pCurrNode->next;
-
- lim_log(pMac, LOG1, FL("=====> lim_delete_pre_auth_list "));
lim_release_pre_auth_node(pMac, pCurrNode);
pCurrNode = pTempNode;
@@ -393,8 +375,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
pMac->lim.pLimPreAuthList = pTempNode->next;
- lim_log(pMac, LOGD,
- FL("first node to delete, Release data entry: %p id %d peer"),
+ pe_debug("first node to delete, Release data entry: %p id %d peer",
pTempNode, pTempNode->authNodeIdx);
lim_print_mac_addr(pMac, macAddr, LOGD);
lim_release_pre_auth_node(pMac, pTempNode);
@@ -412,8 +393,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
pPrevNode->next = pTempNode->next;
- lim_log(pMac, LOGD,
- FL("subsequent node to delete, Release data entry: %p id %d peer"),
+ pe_debug("subsequent node to delete, Release data entry: %p id %d peer",
pTempNode, pTempNode->authNodeIdx);
lim_print_mac_addr(pMac, macAddr, LOGD);
lim_release_pre_auth_node(pMac, pTempNode);
@@ -425,9 +405,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
pTempNode = pTempNode->next;
}
- /* Should not be here */
- /* Log error */
- lim_log(pMac, LOGE, FL("peer not found in pre-auth list, addr= "));
+ pe_err("peer not found in pre-auth list, addr= ");
lim_print_mac_addr(pMac, macAddr, LOGE);
} /*** end lim_delete_pre_auth_node() ***/
@@ -743,7 +721,7 @@ lim_decrypt_auth_frame(tpAniSirGlobal pMac, uint8_t *pKey, uint8_t *pEncrBody,
/* Compare RX_ICV with computed ICV */
for (i = 0; i < SIR_MAC_WEP_ICV_LENGTH; i++) {
- lim_log(pMac, LOGD, FL(" computed ICV%d[%x], rxed ICV%d[%x]"),
+ pe_debug("computed ICV%d[%x], rxed ICV%d[%x]",
i, icv[i], i,
pPlainBody[frameLen - SIR_MAC_WEP_ICV_LENGTH + i]);
@@ -807,9 +785,7 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac,
uint32_t val = 0;
if (pMlmSetKeysReq->numKeys > SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS) {
- lim_log(pMac, LOGD,
- FL
- ("numKeys = %d is more than SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS"),
+ pe_debug("numKeys = %d is more than SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS",
pMlmSetKeysReq->numKeys);
/* Respond to SME with error code */
@@ -820,8 +796,7 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac,
pSetBssKeyParams = qdf_mem_malloc(sizeof(tSetBssKeyParams));
if (NULL == pSetBssKeyParams) {
- lim_log(pMac, LOGE,
- FL("Unable to allocate memory during SET_BSSKEY"));
+ pe_err("Unable to allocate memory during SET_BSSKEY");
/* Respond to SME with error code */
mlmSetKeysCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE;
@@ -833,7 +808,7 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac,
pSetBssKeyParams->encType = pMlmSetKeysReq->edType;
if (eSIR_SUCCESS != wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val))
- lim_log(pMac, LOGW, FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
+ pe_warn("Unable to read WNI_CFG_SINGLE_TID_RC");
pSetBssKeyParams->singleTidRc = (uint8_t) val;
@@ -867,12 +842,11 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac,
msgQ.bodyptr = pSetBssKeyParams;
msgQ.bodyval = 0;
- lim_log(pMac, LOGD, FL("Sending WMA_SET_BSSKEY_REQ..."));
+ pe_debug("Sending WMA_SET_BSSKEY_REQ...");
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("Posting SET_BSSKEY to HAL failed, reason=%X"),
+ pe_err("Posting SET_BSSKEY to HAL failed, reason=%X",
retCode);
/* Respond to SME with LIM_MLM_SETKEYS_CNF */
@@ -921,8 +895,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
/* Package WMA_SET_STAKEY_REQ message parameters */
pSetStaKeyParams = qdf_mem_malloc(sizeof(tSetStaKeyParams));
if (NULL == pSetStaKeyParams) {
- lim_log(pMac, LOGE,
- FL("Unable to allocate memory during SET_BSSKEY"));
+ pe_err("Unable to allocate memory during SET_BSSKEY");
return;
}
@@ -931,7 +904,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
pSetStaKeyParams->encType = pMlmSetKeysReq->edType;
if (eSIR_SUCCESS != wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val))
- lim_log(pMac, LOGW, FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
+ pe_warn("Unable to read WNI_CFG_SINGLE_TID_RC");
pSetStaKeyParams->singleTidRc = (uint8_t) val;
@@ -1011,8 +984,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
pMlmSetKeysReq->numKeys =
SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS;
} else {
- lim_log(pMac, LOGE, FL("Wrong Key Index %d"),
- defWEPIdx);
+ pe_err("Wrong Key Index %d", defWEPIdx);
qdf_mem_free(pSetStaKeyParams);
return;
}
@@ -1039,12 +1011,11 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
msgQ.bodyptr = pSetStaKeyParams;
msgQ.bodyval = 0;
- lim_log(pMac, LOGD, FL("Sending WMA_SET_STAKEY_REQ..."));
+ pe_debug("Sending WMA_SET_STAKEY_REQ...");
MTRACE(mac_trace_msg_tx(pMac, sessionEntry->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
- lim_log(pMac, LOGE,
- FL("Posting SET_STAKEY to HAL failed, reason=%X"),
+ pe_err("Posting SET_STAKEY to HAL failed, reason=%X",
retCode);
/* Respond to SME with LIM_MLM_SETKEYS_CNF */
mlmSetKeysCnf.resultCode = eSIR_SME_HAL_SEND_MESSAGE_FAIL;