diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-03-17 11:30:55 -0700 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-03-21 09:41:10 -0700 |
| commit | 5c8a68696e83aa0959c6c932762f01fc21f21a59 (patch) | |
| tree | e72ac99fdc2b259a8229b5ff8547a766e827617d | |
| parent | 8fd1bf97f484fdd337598660183353ce56e0b3c2 (diff) | |
qcacld-3.0: Replace sms_log() with sme_* log levels in csr_host_scan_roam.c
Replace sms_log() with sme_* appropriate log levels in csr_host_scan_roam.c.
Change-Id: I3076cfadab4917ae14cd1d9d7277677bc711a272
CRs-Fixed: 2020798
| -rw-r--r-- | core/sme/src/csr/csr_host_scan_roam.c | 78 |
1 files changed, 27 insertions, 51 deletions
diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c index 267a44196816..6b3ed9f22d1d 100644 --- a/core/sme/src/csr/csr_host_scan_roam.c +++ b/core/sme/src/csr/csr_host_scan_roam.c @@ -82,7 +82,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, if (pEntry) { pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); if (!pCommand) { - sms_log(pMac, LOGE, FL(" fail to get command buffer")); + sme_err("fail to get command buffer"); return QDF_STATUS_E_RESOURCES; } if (eSmeCommandRoam == pCommand->command) { @@ -94,15 +94,13 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, pEntry, LL_ACCESS_LOCK); else - sms_log(pMac, LOGE, - FL(" Unexpected roam cmd present")); + sme_err("Unexpected roam cmd present"); if (fRemoveCmd == false) pCommand = NULL; } } if (NULL == pCommand) { - sms_log(pMac, LOGE, - FL(" fail to get cmd buf based on prev roam command")); + sme_err("fail to get cmd buf based on prev roam command"); return QDF_STATUS_E_RESOURCES; } do { @@ -117,8 +115,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc; status = csr_queue_sme_command(pMac, pCommand, fHighPriority); if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - FL("fail to send message status=%d"), status); + sme_err("fail to send message status: %d", status); csr_release_command_roam(pMac, pCommand); } } while (0); @@ -215,7 +212,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, if (conc_channel && (conc_channel != scan_result->BssDescriptor.channelId)) { - sms_log(mac_ctx, LOGD, FL("MCC not supported so Ignore AP on channel %d"), + sme_debug("MCC not supported so Ignore AP on channel %d", scan_result->BssDescriptor.channelId); continue; } @@ -240,8 +237,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, if ((n_roam_info->is11rAssoc) && (!csr_neighbor_roam_is_preauth_candidate(mac_ctx, sessionid, descr->bssId))) { - sms_log(mac_ctx, LOGE, - FL("BSSID in preauth faillist.Ignore")); + sme_err("BSSID in preauth fail list. Ignore"); continue; } @@ -250,8 +246,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, (n_roam_info->isESEAssoc) && !csr_neighbor_roam_is_preauth_candidate(mac_ctx, sessionid, descr->bssId)) { - sms_log(mac_ctx, LOGE, - FL("BSSID in preauth faillist.Ignore")); + sme_err("BSSID in preauth faillist. Ignore"); continue; } @@ -259,8 +254,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, qavail = descr->QBSSLoad_avail; voadmitted = n_roam_info->isVOAdmitted; if (voadmitted) - sms_log(mac_ctx, LOGD, - FL("New QBSS=%s,BWavail=0x%x,req=0x%x"), + sme_debug("New QBSS=%s,BWavail=0x%x,req=0x%x", ((qpresent) ? "yes" : "no"), qavail, n_roam_info->MinQBssLoadRequired); if (voadmitted && qpresent && @@ -288,8 +282,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, if (csr_roam_is_fast_roam_enabled(mac_ctx, sessionid) && !csr_neighbor_roam_is_preauth_candidate(mac_ctx, sessionid, descr->bssId)) { - sms_log(mac_ctx, LOGE, - FL("BSSID in preauth faillist Ignore")); + sme_err("BSSID in preauth faillist Ignore"); continue; } @@ -310,8 +303,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, bss_info = qdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); if (NULL == bss_info) { - sms_log(mac_ctx, LOGE, - FL("Memory alloc fail. Ignored cnd.")); + sme_err("Memory alloc fail"); continue; } bss_info->pBssDescription = @@ -321,8 +313,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, qdf_mem_copy(bss_info->pBssDescription, descr, descr->length + sizeof(descr->length)); } else { - sms_log(mac_ctx, LOGE, - FL("Mem alloc failed. Ignore cand.")); + sme_err("Memory alloc fail"); qdf_mem_free(bss_info); continue; } @@ -378,7 +369,7 @@ void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx, if (csr_roam_is_fast_roam_enabled(mac_ctx, session_id)) csr_neighbor_roam_issue_preauth_req(mac_ctx, session_id); else - sms_log(mac_ctx, LOGE, FL("Roaming is disabled")); + sme_err("Roaming is disabled"); } /** @@ -401,20 +392,16 @@ QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac, &scanFilter, sessionId); - sms_log(pMac, LOGD, - FL("Prepare scan to find neighbor AP filter status = %d"), + sme_debug("Prepare scan to find neighbor AP filter status: %d", hstatus); if (QDF_STATUS_SUCCESS != hstatus) { - sms_log(pMac, LOGE, - FL("Scan Filter prep fail for Assoc %d Bail out"), + sme_err("Scan Filter prep fail for Assoc %d Bail out", tempVal); return QDF_STATUS_E_FAILURE; } hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult); if (hstatus != QDF_STATUS_SUCCESS) { - sms_log(pMac, LOGE, - FL("Get Scan Result status code %d"), - hstatus); + sme_err("Get Scan Result status code %d", hstatus); } /* Process the scan results and update roamable AP list */ csr_neighbor_roam_process_scan_results(pMac, sessionId, &scanResult); @@ -470,14 +457,13 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, &pMac->roam.neighborRoamInfo[sessionId]; QDF_STATUS status = QDF_STATUS_SUCCESS; - sms_log(pMac, LOGD, FL("Received indication from firmware")); + sme_debug("Received indication from firmware"); /* we must be in connected state, if not ignore it */ if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != pNeighborRoamInfo->neighborRoamState) || (pNeighborRoamInfo->uOsRequestedHandoff)) { - sms_log(pMac, LOGE, - FL("Recvd in NotCONNECTED or OsReqHandoff. Ignore")); + sme_err("Recvd in NotCONNECTED or OsReqHandoff. Ignore"); status = QDF_STATUS_E_FAILURE; } else { /* Firmware indicated that roaming candidate is found. Beacons @@ -495,8 +481,7 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, status = csr_neighbor_roam_process_scan_complete(pMac, sessionId); if (QDF_STATUS_SUCCESS != status) { - sms_log(pMac, LOGE, - FL("scan process complete failed, status %d"), + sme_err("scan process complete failed, status %d", status); return QDF_STATUS_E_FAILURE; } @@ -519,8 +504,7 @@ void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx, { tpCsrNeighborRoamBSSInfo result = NULL; - sms_log(mac_ctx, LOGD, - FL("Emptying the BSS list. Current count = %d"), + sme_debug("Emptying the BSS list. Current count: %d", csr_ll_count(llist)); /* @@ -557,8 +541,7 @@ bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal pMac, LL_ACCESS_LOCK); } - sms_log(pMac, LOGD, - FL("Remove neigh BSS node from fail list. Current count = %d"), + sme_debug("Remove neigh BSS node from fail list. Current count: %d", csr_ll_count(pList)); return false; @@ -623,8 +606,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, if (neighbor_roam_info->neighborRoamState != eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) { - sms_log(mac_ctx, LOGE, - FL("Roam requested when Neighbor roam is in %s state"), + sme_err("Roam requested when Neighbor roam is in %s state", mac_trace_get_neighbour_roam_state( neighbor_roam_info->neighborRoamState)); return; @@ -672,15 +654,13 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] = handoff_node.pBssDescription->channelId; - sms_log(mac_ctx, LOGD, - " csr_roamHandoffRequested: disassociating with current AP"); + sme_debug("csr_roamHandoffRequested: disassociating with current AP"); if (!QDF_IS_STATUS_SUCCESS (csr_roam_issue_disassociate_cmd (mac_ctx, session_id, eCSR_DISCONNECT_REASON_HANDOFF))) { - sms_log(mac_ctx, LOGW, - "csr_roamHandoffRequested: fail to issue disassoc"); + sme_warn("csr_roamHandoffRequested: fail to issue disassoc"); return; } /* notify HDD for handoff, providing the BSSID too */ @@ -729,8 +709,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, pMac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList, NULL); - sms_log(pMac, LOGD, - FL("Number of Handoff candidates = %d"), + sme_debug("Number of Handoff candidates: %d", csr_ll_count(& ngbr_roam_info->FTRoamInfo.preAuthDoneList)); } else @@ -741,8 +720,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, csr_neighbor_roam_next_roamable_ap(pMac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList, NULL); - sms_log(pMac, LOGD, - FL("Number of Handoff candidates = %d"), + sme_debug("Number of Handoff candidates: %d", csr_ll_count(&ngbr_roam_info->FTRoamInfo. preAuthDoneList)); } else @@ -753,8 +731,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, csr_neighbor_roam_next_roamable_ap(pMac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList, NULL); - sms_log(pMac, LOGD, - FL("Number of Handoff candidates = %d"), + sme_debug("Number of Handoff candidates: %d", csr_ll_count( &ngbr_roam_info->FTRoamInfo.preAuthDoneList)); } else { @@ -762,8 +739,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, csr_neighbor_roam_next_roamable_ap(pMac, &ngbr_roam_info->roamableAPList, NULL); - sms_log(pMac, LOGD, - FL("Number of Handoff candidates = %d"), + sme_debug("Number of Handoff candidates: %d", csr_ll_count(&ngbr_roam_info->roamableAPList)); } if (NULL == bss_node) |
