mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-11-11 13:22:39 -05:00
qcacld-3.0: Replace sms_log() with sme_* log levels in csr_roam_preauth.c
Replace sms_log() with sme_* appropriate log levels in csr_roam_preauth.c. Change-Id: I7666242493e493f5c89bcd8c810e89307553184b CRs-Fixed: 2020798
This commit is contained in:
parent
e00f73f820
commit
dbcbafc73c
1 changed files with 26 additions and 47 deletions
|
|
@ -140,7 +140,7 @@ QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal mac_ctx,
|
|||
|
||||
command = csr_get_command_buffer(mac_ctx);
|
||||
if (NULL == command) {
|
||||
sms_log(mac_ctx, LOGE, FL(" fail to get command buffer"));
|
||||
sme_err("fail to get command buffer");
|
||||
status = QDF_STATUS_E_RESOURCES;
|
||||
} else {
|
||||
if (bss_desc) {
|
||||
|
|
@ -151,9 +151,8 @@ QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal mac_ctx,
|
|||
status = csr_queue_sme_command(mac_ctx, command,
|
||||
immediate);
|
||||
if (!QDF_IS_STATUS_SUCCESS(status)) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("fail to queue preauth,status=%d"),
|
||||
status);
|
||||
sme_err("fail to queue preauth,status: %d",
|
||||
status);
|
||||
csr_release_command_preauth(mac_ctx, command);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -251,8 +250,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
|
|||
* of the disconnect command, we would have reset
|
||||
* preauthRspPending and transitioned to INIT state.
|
||||
*/
|
||||
sms_log(mac_ctx, LOGW,
|
||||
FL("Unexpected pre-auth response in state %d"),
|
||||
sme_warn("Unexpected pre-auth response in state %d",
|
||||
neighbor_roam_info->neighborRoamState);
|
||||
preauth_processed = QDF_STATUS_E_FAILURE;
|
||||
goto DEQ_PREAUTH;
|
||||
|
|
@ -260,8 +258,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
|
|||
/* We can receive it in these 2 states. */
|
||||
if ((neighbor_roam_info->neighborRoamState !=
|
||||
eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING)) {
|
||||
sms_log(mac_ctx, LOGW,
|
||||
FL("Preauth response received in state %s"),
|
||||
sme_debug("Preauth response received in state %s",
|
||||
mac_trace_get_neighbour_roam_state
|
||||
(neighbor_roam_info->neighborRoamState));
|
||||
preauth_processed = QDF_STATUS_E_FAILURE;
|
||||
|
|
@ -276,11 +273,9 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
|
|||
mac_ctx, &neighbor_roam_info->roamableAPList,
|
||||
NULL);
|
||||
if ((eSIR_SUCCESS == lim_status) && (NULL != preauth_rsp_node)) {
|
||||
sms_log(mac_ctx, LOGD,
|
||||
FL("Preauth completed successfully after %d tries"),
|
||||
sme_debug("Preauth completed successfully after %d tries",
|
||||
neighbor_roam_info->FTRoamInfo.numPreAuthRetries);
|
||||
sms_log(mac_ctx, LOGD,
|
||||
FL("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"),
|
||||
sme_debug("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d",
|
||||
MAC_ADDR_ARRAY(
|
||||
preauth_rsp_node->pBssDescription->bssId),
|
||||
(int)preauth_rsp_node->pBssDescription->channelId);
|
||||
|
|
@ -314,8 +309,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
|
|||
tListElem *entry;
|
||||
bool is_dis_pending = false;
|
||||
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Preauth failed retry number %d, status = 0x%x"),
|
||||
sme_err("Preauth failed retry number %d, status: 0x%x",
|
||||
neighbor_roam_info->FTRoamInfo.numPreAuthRetries,
|
||||
lim_status);
|
||||
|
||||
|
|
@ -340,8 +334,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
|
|||
&neighbor_roam_info->roamableAPList,
|
||||
LL_ACCESS_LOCK);
|
||||
if (!entry) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Preauth list is empty"));
|
||||
sme_err("Preauth list is empty");
|
||||
goto NEXT_PREAUTH;
|
||||
}
|
||||
neighbor_bss_node = GET_BASE_ADDR(entry,
|
||||
|
|
@ -368,8 +361,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
|
|||
NEXT_PREAUTH:
|
||||
is_dis_pending = is_disconnect_pending(mac_ctx, session_id);
|
||||
if (is_dis_pending) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Disconnect in progress, Abort preauth"));
|
||||
sme_err("Disconnect in progress, Abort preauth");
|
||||
goto ABORT_PREAUTH;
|
||||
}
|
||||
/* Issue preauth request for the same/next entry */
|
||||
|
|
@ -416,8 +408,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
|
|||
uint8_t num_mac_addr = neighbor_roam_info->FTRoamInfo.preAuthFailList.
|
||||
numMACAddress;
|
||||
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL(" Added BSSID " MAC_ADDRESS_STR " to Preauth failed list"),
|
||||
sme_warn("Added BSSID " MAC_ADDRESS_STR " to Preauth failed list",
|
||||
MAC_ADDR_ARRAY(bssid));
|
||||
|
||||
for (i = 0;
|
||||
|
|
@ -426,16 +417,14 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
|
|||
if (!qdf_mem_cmp(
|
||||
neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i],
|
||||
bssid, sizeof(tSirMacAddr))) {
|
||||
sms_log(mac_ctx, LOGW,
|
||||
FL("BSSID "MAC_ADDRESS_STR" already fail list"),
|
||||
sme_warn("BSSID "MAC_ADDRESS_STR" already fail list",
|
||||
MAC_ADDR_ARRAY(bssid));
|
||||
return QDF_STATUS_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
if ((num_mac_addr + 1) > MAX_NUM_PREAUTH_FAIL_LIST_ADDRESS) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Cannot add, preauth fail list is full."));
|
||||
sme_err("Cannot add, preauth fail list is full");
|
||||
return QDF_STATUS_E_FAILURE;
|
||||
}
|
||||
qdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList.
|
||||
|
|
@ -474,8 +463,7 @@ bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac,
|
|||
if (!qdf_mem_cmp(pNeighborRoamInfo->FTRoamInfo.
|
||||
preAuthFailList.macAddress[i], bssId,
|
||||
sizeof(tSirMacAddr))) {
|
||||
sms_log(pMac, LOGE,
|
||||
FL("BSSID exists in fail list" MAC_ADDRESS_STR),
|
||||
sme_err("BSSID exists in fail list" MAC_ADDRESS_STR,
|
||||
MAC_ADDR_ARRAY(bssId));
|
||||
return false;
|
||||
}
|
||||
|
|
@ -501,17 +489,15 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hal, uint32_t session_id,
|
|||
tCsrRoamSession *csr_session = CSR_GET_SESSION(mac_ctx, session_id);
|
||||
|
||||
if (NULL == csr_session) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Session does not exist for session id(%d)"),
|
||||
session_id);
|
||||
sme_err("Session does not exist for session id: %d",
|
||||
session_id);
|
||||
return QDF_STATUS_E_FAILURE;
|
||||
}
|
||||
|
||||
auth_req_len = sizeof(tSirFTPreAuthReq);
|
||||
preauth_req = (tpSirFTPreAuthReq) qdf_mem_malloc(auth_req_len);
|
||||
if (NULL == preauth_req) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Memory allocation for FT Preauth request failed"));
|
||||
sme_err("Memory allocation for FT Preauth request failed");
|
||||
return QDF_STATUS_E_NOMEM;
|
||||
}
|
||||
/* Save the SME Session ID. We need it while processing preauth resp */
|
||||
|
|
@ -521,8 +507,7 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hal, uint32_t session_id,
|
|||
(tpSirBssDescription) qdf_mem_malloc(sizeof(bss_desc->length)
|
||||
+ bss_desc->length);
|
||||
if (NULL == preauth_req->pbssDescription) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Memory allocation for FT Preauth request failed"));
|
||||
sme_err("Memory allocation for FT Preauth request failed");
|
||||
return QDF_STATUS_E_NOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -574,14 +559,13 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hal,
|
|||
tDot11fAuthentication *p_auth = NULL;
|
||||
|
||||
if (NULL == csr_session) {
|
||||
sms_log(mac_ctx, LOGE, FL("CSR session is NULL"));
|
||||
sme_err("CSR session is NULL");
|
||||
return;
|
||||
}
|
||||
status = csr_neighbor_roam_preauth_rsp_handler(mac_ctx,
|
||||
preauth_rsp->smeSessionId, preauth_rsp->status);
|
||||
if (status != QDF_STATUS_SUCCESS) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Preauth was not processed: %d SessionID: %d"),
|
||||
sme_err("Preauth was not processed: %d SessionID: %d",
|
||||
status, session_id);
|
||||
return;
|
||||
}
|
||||
|
|
@ -605,8 +589,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hal,
|
|||
&csr_session->ftSmeContext.preAuthReassocIntvlTimer,
|
||||
60);
|
||||
if (QDF_STATUS_SUCCESS != status) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("PreauthReassocInterval timer failed status %d"),
|
||||
sme_err("PreauthReassocInterval timer failed status %d",
|
||||
status);
|
||||
return;
|
||||
}
|
||||
|
|
@ -670,8 +653,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hal,
|
|||
preauth_rsp->ft_ies,
|
||||
preauth_rsp->ft_ies_length, p_auth);
|
||||
if (DOT11F_FAILED(status))
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Failed to parse an Authentication frame"));
|
||||
sme_err("Failed to parse an Authentication frame");
|
||||
else if (p_auth->MobilityDomain.present)
|
||||
csr_session->ftSmeContext.addMDIE = true;
|
||||
|
||||
|
|
@ -683,8 +665,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hal,
|
|||
csr_session->ftSmeContext.reassoc_ft_ies =
|
||||
qdf_mem_malloc(ft_ies_length);
|
||||
if (NULL == csr_session->ftSmeContext.reassoc_ft_ies) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Memory allocation failed for ft_ies"));
|
||||
sme_err("Memory allocation failed for ft_ies");
|
||||
return;
|
||||
} else {
|
||||
/* Copy the RIC IEs to reassoc IEs */
|
||||
|
|
@ -736,7 +717,7 @@ QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx,
|
|||
&neighbor_roam_info->roamableAPList, NULL);
|
||||
|
||||
if (NULL == neighbor_bss_node) {
|
||||
sms_log(mac_ctx, LOGW, FL("Roamable AP list is empty.. "));
|
||||
sme_err("Roamable AP list is empty..");
|
||||
return QDF_STATUS_E_FAILURE;
|
||||
} else {
|
||||
csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id,
|
||||
|
|
@ -746,15 +727,13 @@ QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx,
|
|||
neighbor_bss_node->pBssDescription,
|
||||
eCsrPerformPreauth, true);
|
||||
|
||||
sms_log(mac_ctx, LOGD,
|
||||
FL("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"),
|
||||
sme_debug("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d",
|
||||
MAC_ADDR_ARRAY(
|
||||
neighbor_bss_node->pBssDescription->bssId),
|
||||
(int)neighbor_bss_node->pBssDescription->channelId);
|
||||
|
||||
if (QDF_STATUS_SUCCESS != status) {
|
||||
sms_log(mac_ctx, LOGE,
|
||||
FL("Return failed preauth request status %d"),
|
||||
sme_err("Return failed preauth request status %d",
|
||||
status);
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue