From fd40af48d23b2233a60739b31510da42746e5443 Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Tue, 29 May 2018 13:24:41 +0530 Subject: qcacld-2.0: Remove redundant API sme_staInMiddleOfRoaming Driver has smeNeighborMiddleOfRoaming to check if STA is in middle of roaming. Further sme_staInMiddleOfRoaming acquires lock to know roam status, which is not required at all. Further driver can enter sleep state because of mutex lock in suspend path and can result in DPM device timeout. Hence, replace sme_staInMiddleOfRoaming with smeNeighborMiddleOfRoaming and remove redundant API sme_staInMiddleOfRoaming. Driver does not use any lock in smeNeighborMiddleOfRoaming to check roaming status. Change-Id: I96193becaa05a68044e092bb607eb5db60526a11 CRs-Fixed: 2250171 --- CORE/HDD/src/wlan_hdd_cfg80211.c | 4 ++-- CORE/SME/inc/sme_Api.h | 9 --------- CORE/SME/src/sme_common/sme_Api.c | 20 -------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 5b4eb638995c..c575a8616320 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -14658,7 +14658,7 @@ static int __wlan_hdd_cfg80211_fast_roaming(struct wiphy *wiphy, * defer out-network roaming. EBUSY is used to convey wait indication. */ if (!is_fast_roam_enabled) { - if (sme_staInMiddleOfRoaming(hdd_ctx->hHal, + if (smeNeighborMiddleOfRoaming(hdd_ctx->hHal, adapter->sessionId)) { hddLog(LOG1, FL("Roaming in progress, do not allow disable")); return -EBUSY; @@ -30643,7 +30643,7 @@ int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, } } - if (sme_staInMiddleOfRoaming(pHddCtx->hHal, pAdapter->sessionId)) { + if (smeNeighborMiddleOfRoaming(pHddCtx->hHal, pAdapter->sessionId)) { hddLog(LOG1, FL("Roaming in progress, don't allow suspend")); return -EAGAIN; } diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h index 36d79bf68483..62bb95ca1f3c 100644 --- a/CORE/SME/inc/sme_Api.h +++ b/CORE/SME/inc/sme_Api.h @@ -4122,15 +4122,6 @@ eHalStatus sme_UpdateDFSScanMode(tHalHandle hHal, --------------------------------------------------------------------------*/ v_BOOL_t sme_GetDFSScanMode(tHalHandle hHal); -/* --------------------------------------------------------------------------- - \fn sme_staInMiddleOfRoaming - \brief This function returns TRUE if STA is in the middle of roaming state - \param hHal - HAL handle for device - \param sessionId - Session identifier - \- return TRUE or FALSE - -------------------------------------------------------------------------*/ -tANI_BOOLEAN sme_staInMiddleOfRoaming(tHalHandle hHal, tANI_U8 sessionId); - /* --------------------------------------------------------------------------- \fn sme_PsOffloadIsStaInPowerSave \brief This function returns TRUE if STA is in power save diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 8499616ffc96..86ce527f8565 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -15886,26 +15886,6 @@ eHalStatus sme_UpdateAddIE(tHalHandle hHal, return (status); } -/* --------------------------------------------------------------------------- - \fn sme_staInMiddleOfRoaming - \brief This function returns TRUE if STA is in the middle of roaming state - \param hHal - HAL handle for device - \param sessionId - Session Identifier - \- return TRUE or FALSE - -------------------------------------------------------------------------*/ -tANI_BOOLEAN sme_staInMiddleOfRoaming(tHalHandle hHal, tANI_U8 sessionId) -{ - tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); - eHalStatus status = eHAL_STATUS_SUCCESS; - tANI_BOOLEAN ret = FALSE; - - if (eHAL_STATUS_SUCCESS == (status = sme_AcquireGlobalLock(&pMac->sme))) { - ret = csrNeighborMiddleOfRoaming(hHal, sessionId); - sme_ReleaseGlobalLock(&pMac->sme); - } - return ret; -} - /* --------------------------------------------------------------------------- \fn sme_PsOffloadIsStaInPowerSave \brief This function returns TRUE if STA is in power save -- cgit v1.2.3