diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c index 9238c2c1b832b190db89574e183fc82d6f8d0bd9..af92a85051570c39920fba78fa5ffcb272c17bb4 100644 --- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -10577,7 +10577,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; @@ -23673,7 +23673,7 @@ int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, pAdapter = pAdapterNode->pAdapter; pScanInfo = &pAdapter->scan_info; - if (sme_staInMiddleOfRoaming(pHddCtx->hHal, pAdapter->sessionId)) { + if (smeNeighborMiddleOfRoaming(pHddCtx->hHal, pAdapter->sessionId)) { hddLog(LOG1, FL("Roaming in progress, do not allow suspend")); return -EAGAIN; } diff --git a/drivers/staging/qcacld-2.0/CORE/SME/inc/sme_Api.h b/drivers/staging/qcacld-2.0/CORE/SME/inc/sme_Api.h index ae514dd2521734c883883de94f2ec6bc67e517a0..fd0386608454be1f21cadf5e993a7e31046df0e3 100644 --- a/drivers/staging/qcacld-2.0/CORE/SME/inc/sme_Api.h +++ b/drivers/staging/qcacld-2.0/CORE/SME/inc/sme_Api.h @@ -3963,15 +3963,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/drivers/staging/qcacld-2.0/CORE/SME/src/sme_common/sme_Api.c b/drivers/staging/qcacld-2.0/CORE/SME/src/sme_common/sme_Api.c index 446b7961740e62be6034ee2d7ca3ea3f62ebb7bf..600c145c368cb103fe9cfa17528341e2ba9b89f4 100644 --- a/drivers/staging/qcacld-2.0/CORE/SME/src/sme_common/sme_Api.c +++ b/drivers/staging/qcacld-2.0/CORE/SME/src/sme_common/sme_Api.c @@ -15335,26 +15335,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