diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-05-31 07:08:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-31 07:08:46 -0700 |
| commit | f49faf17bc3efe1439b2f0d75150e3c74dc709fb (patch) | |
| tree | cd986e54c37bb4223942b4294b36ff449d3a6de5 | |
| parent | 9a39afc4f60c84c2512d299a3aab20737330f70f (diff) | |
| parent | fd40af48d23b2233a60739b31510da42746e5443 (diff) | |
Merge "qcacld-2.0: Remove redundant API sme_staInMiddleOfRoaming" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 4 | ||||
| -rw-r--r-- | CORE/SME/inc/sme_Api.h | 9 | ||||
| -rw-r--r-- | 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 @@ -4123,15 +4123,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 \param hHal - HAL handle for device 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 @@ -15887,26 +15887,6 @@ eHalStatus sme_UpdateAddIE(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) -{ - 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 \param hHal - HAL handle for device |