From 008dd2b3268040889518bb2f4fe7c295340ab012 Mon Sep 17 00:00:00 2001 From: sheenam monga Date: Tue, 4 Feb 2020 16:56:11 +0530 Subject: [PATCH] qcacld-3.0: Log optimization for Roam Invoke Currently there are unnecessary/duplicate logging. Identify and reduce those logs that are not necessary. Change-Id: I5ec0a7e06cdade73f0e99369ad89b0b677a9a96b CRs-Fixed: 2615407 --- core/sme/src/common/sme_api.c | 5 ++--- core/sme/src/csr/csr_api_roam.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 33c87979bc04..332302d2d2cb 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -13949,7 +13949,7 @@ QDF_STATUS sme_roam_invoke_nud_fail(mac_handle_t mac_handle, uint8_t vdev_id) } if (vdev_roam_params->roam_invoke_in_progress) { - sme_debug("Roaming in progress set by source = %d, aborting this roam invoke", + sme_debug("Roaming already initiated by %d source", vdev_roam_params->source); wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID); return QDF_STATUS_E_BUSY; @@ -13976,9 +13976,8 @@ QDF_STATUS sme_roam_invoke_nud_fail(mac_handle_t mac_handle, uint8_t vdev_id) } else { vdev_roam_params->roam_invoke_in_progress = true; vdev_roam_params->source = CONNECTION_MGR_INITIATED; - sme_debug("Trigger roaming for vdev id %d source = CONNECTION_MGR_INITIATED", - session->sessionId); } + wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID); return status; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 9504c4682b24..6eed8d2ab943 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -20903,7 +20903,7 @@ QDF_STATUS csr_fast_reassoc(mac_handle_t mac_handle, } if (vdev_roam_params->roam_invoke_in_progress) { - sme_debug("Roaming in progress set by source = %d, aborting this roam invoke", + sme_debug("Roaming already initiated by %d source", vdev_roam_params->source); wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID); return QDF_STATUS_E_FAILURE; @@ -20915,10 +20915,9 @@ QDF_STATUS csr_fast_reassoc(mac_handle_t mac_handle, return QDF_STATUS_E_NOMEM; } /* if both are same then set the flag */ - if (!qdf_mem_cmp(connected_bssid, bssid, ETH_ALEN)) { + if (!qdf_mem_cmp(connected_bssid, bssid, ETH_ALEN)) fastreassoc->is_same_bssid = true; - sme_debug("bssid same, bssid[%pM]", bssid); - } + fastreassoc->vdev_id = vdev_id; fastreassoc->bssid[0] = bssid[0]; fastreassoc->bssid[1] = bssid[1]; @@ -20975,11 +20974,10 @@ QDF_STATUS csr_fast_reassoc(mac_handle_t mac_handle, } else { vdev_roam_params->roam_invoke_in_progress = true; vdev_roam_params->source = USERSPACE_INITIATED; - sme_debug("Trigger roaming for vdev id %d source = USERSPACE_INITIATED", - session->sessionId); } wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID); + return status; } @@ -21072,13 +21070,13 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx, eCSR_ROAM_NAPI_OFF, eCSR_ROAM_RESULT_SUCCESS); goto end; case SIR_ROAMING_INVOKE_FAIL: + sme_debug("Roaming triggered failed source %d", + vdev_roam_params->source); if (vdev_roam_params->source == USERSPACE_INITIATED) { /* Userspace roam req fail, disconnect with AP */ - sme_debug("LFR3: roam invoke from user-space fail, dis cur AP"); csr_roam_disconnect(mac_ctx, session_id, eCSR_DISCONNECT_REASON_DEAUTH); } - sme_debug("Roaming Failed, clearing roam invoke in progress"); vdev_roam_params->roam_invoke_in_progress = false; goto end; case SIR_ROAM_SYNCH_PROPAGATION: