wlan: Fix for incorrect Listen interval value from Host to Riva.
When concurrent sessions are present(STA + GO or STA + P2P CLI) and
when DUT is suspended suppose if one sesssion gets disconnected
then DUT enters BMPS with incorrect Listen interval. Fix is to ensure
that correct LI is passed to RIVA.
CRs-Fixed: 487413
Change-Id: I53b7a2a9a89b71ebac3b9119b64649c9bf9cc93b
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 2878d7d..742c32f 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -815,8 +815,7 @@
// In case of JB, as Change-Iface may or maynot be called for p2p0
// Enable BMPS/IMPS in case P2P_CLIENT disconnected
if(((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
- (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) &&
- (vos_concurrent_sessions_running()))
+ (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)))
{
//Enable BMPS only of other Session is P2P Client
hdd_context_t *pHddCtx = NULL;
@@ -832,20 +831,12 @@
if((0 == pHddCtx->no_of_sessions[VOS_STA_SAP_MODE]) &&
(0 == pHddCtx->no_of_sessions[VOS_P2P_GO_MODE]))
{
- if (pHddCtx->hdd_wlan_suspended)
- {
- if(WLAN_HDD_INFRA_STATION == pAdapter->device_mode)
- {
- hdd_reset_pwrparams(pHddCtx);
- }
- else
- {
- hdd_set_pwrparams(pHddCtx);
- }
- }
-
+ if (pHddCtx->hdd_wlan_suspended)
+ {
+ hdd_set_pwrparams(pHddCtx);
+ }
hdd_enable_bmps_imps(pHddCtx);
- }
+ }
}
}
}
@@ -1445,24 +1436,16 @@
if(NULL != pHddCtx)
{
- //Only P2P Client is there Enable Bmps back
- if((0 == pHddCtx->no_of_sessions[VOS_STA_SAP_MODE]) &&
- (0 == pHddCtx->no_of_sessions[VOS_P2P_GO_MODE]))
- {
- if (pHddCtx->hdd_wlan_suspended)
- {
- if(WLAN_HDD_INFRA_STATION == pAdapter->device_mode)
+ //Only P2P Client is there Enable Bmps back
+ if((0 == pHddCtx->no_of_sessions[VOS_STA_SAP_MODE]) &&
+ (0 == pHddCtx->no_of_sessions[VOS_P2P_GO_MODE]))
+ {
+ if (pHddCtx->hdd_wlan_suspended)
{
- hdd_reset_pwrparams(pHddCtx);
+ hdd_set_pwrparams(pHddCtx);
}
- else
- {
- hdd_set_pwrparams(pHddCtx);
- }
- }
-
- hdd_enable_bmps_imps(pHddCtx);
- }
+ hdd_enable_bmps_imps(pHddCtx);
+ }
}
}
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 59a0b1d..65e5efd 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2679,6 +2679,10 @@
/* In case of JB, for P2P-GO, only change interface will be called,
* This is the right place to enable back bmps_imps()
*/
+ if (pHddCtx->hdd_wlan_suspended)
+ {
+ hdd_set_pwrparams(pHddCtx);
+ }
hdd_enable_bmps_imps(pHddCtx);
goto done;
case NL80211_IFTYPE_AP:
@@ -5641,6 +5645,10 @@
if((VOS_STATUS_SUCCESS == exitbmpsStatus) &&
(NULL != pHddCtx))
{
+ if (pHddCtx->hdd_wlan_suspended)
+ {
+ hdd_set_pwrparams(pHddCtx);
+ }
//ReEnable Bmps and Imps back
hdd_enable_bmps_imps(pHddCtx);
}
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 1878331..b3d9def 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -792,9 +792,9 @@
hdd_context_t *pHddCtx = NULL;
v_CONTEXT_t pVosContext = NULL;
- hdd_adapter_t *pAdapter = NULL;
- hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
VOS_STATUS status;
+ hdd_adapter_t *pAdapter = NULL;
+ hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
hddLog(VOS_TRACE_LEVEL_INFO, "%s: WLAN being suspended by Android OS",__func__);
@@ -819,7 +819,19 @@
return;
}
- /*loop through all adapters. TBD fix for Concurrency */
+ hdd_set_pwrparams(pHddCtx);
+
+ if (BMPS == pmcGetPmcState(pHddCtx->hHal))
+ {
+ /* put the device into full power */
+ wlan_hdd_enter_bmps(pAdapter, DRIVER_POWER_MODE_ACTIVE);
+
+ /* put the device back into BMPS */
+ wlan_hdd_enter_bmps(pAdapter, DRIVER_POWER_MODE_AUTO);
+
+ pHddCtx->hdd_ignore_dtim_enabled = TRUE;
+ }
+
status = hdd_get_front_adapter ( pHddCtx, &pAdapterNode );
while ( NULL != pAdapterNode && VOS_STATUS_SUCCESS == status )
{
@@ -841,73 +853,15 @@
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
}
- else if (pHddCtx->cfg_ini->nEnableSuspend ==
+ else if (pHddCtx->cfg_ini->nEnableSuspend ==
WLAN_MAP_SUSPEND_TO_DEEP_SLEEP)
{
//Execute deep sleep procedure
hdd_enter_deep_sleep(pHddCtx, pAdapter);
}
#endif
-
- //Apply Dynamic Dtim For P2P
- //Only if ignoreDynamicDtimInP2pMode is not set in ini
- if((pHddCtx->cfg_ini->enableDynamicDTIM ||
- pHddCtx->cfg_ini->enableModulatedDTIM) &&
- ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
- ((WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) &&
- !(pHddCtx->cfg_ini->ignoreDynamicDtimInP2pMode))) &&
- (eANI_BOOLEAN_TRUE == pAdapter->higherDtimTransition) &&
- (eConnectionState_Associated ==
- (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState) &&
- (pHddCtx->cfg_ini->fIsBmpsEnabled))
- {
- tSirSetPowerParamsReq powerRequest = { 0 };
-
- powerRequest.uIgnoreDTIM = 1;
- powerRequest.uMaxLIModulatedDTIM = pHddCtx->cfg_ini->fMaxLIModulatedDTIM;
-
- /*Back up the actual values from CFG */
- wlan_cfgGetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM,
- &pHddCtx->hdd_actual_ignore_DTIM_value);
- wlan_cfgGetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL,
- &pHddCtx->hdd_actual_LI_value);
-
- if(pHddCtx->cfg_ini->enableModulatedDTIM)
- {
- powerRequest.uDTIMPeriod = pHddCtx->cfg_ini->enableModulatedDTIM;
- powerRequest.uListenInterval = pHddCtx->hdd_actual_LI_value;
- }
- else
- {
- powerRequest.uListenInterval = pHddCtx->cfg_ini->enableDynamicDTIM;
- }
-
- /* Update ignoreDTIM and ListedInterval in CFG to remain at the DTIM
- *specified during Enter/Exit BMPS when LCD off*/
- ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, powerRequest.uIgnoreDTIM,
- NULL, eANI_BOOLEAN_FALSE);
- ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL, powerRequest.uListenInterval,
- NULL, eANI_BOOLEAN_FALSE);
-
- /* switch to the DTIM specified in cfg.ini */
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Switch to DTIM%d \n", powerRequest.uListenInterval);
- sme_SetPowerParams( WLAN_HDD_GET_HAL_CTX(pAdapter), &powerRequest, FALSE);
-
- if (BMPS == pmcGetPmcState(pHddCtx->hHal))
- {
- /* put the device into full power */
- wlan_hdd_enter_bmps(pAdapter, DRIVER_POWER_MODE_ACTIVE);
-
- /* put the device back into BMPS */
- wlan_hdd_enter_bmps(pAdapter, DRIVER_POWER_MODE_AUTO);
-
- pHddCtx->hdd_ignore_dtim_enabled = TRUE;
- }
- }
-
- /*Suspend notification sent down to driver*/
- hdd_conf_suspend_ind(pHddCtx, pAdapter);
+ /* Suspend notification sent down to driver*/
+ hdd_conf_suspend_ind(pHddCtx, pAdapter);
#ifdef WLAN_FEATURE_GTK_OFFLOAD
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
@@ -934,12 +888,11 @@
}
}
#endif
+ status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
+ pAdapterNode = pNext;
+ }
- status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
- pAdapterNode = pNext;
- }
- pHddCtx->hdd_wlan_suspended = TRUE;
-
+ pHddCtx->hdd_wlan_suspended = TRUE;
#ifdef SUPPORT_EARLY_SUSPEND_STANDBY_DEEPSLEEP
if(pHddCtx->cfg_ini->nEnableSuspend == WLAN_MAP_SUSPEND_TO_STANDBY)
{
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 7b35388..04aa401 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3400,33 +3400,70 @@
void hdd_set_pwrparams(hdd_context_t *pHddCtx)
{
- tSirSetPowerParamsReq powerRequest = { 0 };
+ VOS_STATUS status;
+ hdd_adapter_t *pAdapter = NULL;
+ hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
- powerRequest.uIgnoreDTIM = 1;
- powerRequest.uMaxLIModulatedDTIM = pHddCtx->cfg_ini->fMaxLIModulatedDTIM;
+ status = hdd_get_front_adapter ( pHddCtx, &pAdapterNode );
- if (pHddCtx->cfg_ini->enableModulatedDTIM)
+ /*loop through all adapters.*/
+ while ( NULL != pAdapterNode && VOS_STATUS_SUCCESS == status )
{
- powerRequest.uDTIMPeriod = pHddCtx->cfg_ini->enableModulatedDTIM;
- powerRequest.uListenInterval = pHddCtx->hdd_actual_LI_value;
- }
- else
- {
- powerRequest.uListenInterval = pHddCtx->cfg_ini->enableDynamicDTIM;
- }
+ pAdapter = pAdapterNode->pAdapter;
+ if ( (WLAN_HDD_INFRA_STATION != pAdapter->device_mode)
+ && (WLAN_HDD_P2P_CLIENT != pAdapter->device_mode) )
- /* Update ignoreDTIM and ListedInterval in CFG to remain at the DTIM
- *specified during Enter/Exit BMPS when LCD off*/
- ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, powerRequest.uIgnoreDTIM,
- NULL, eANI_BOOLEAN_FALSE);
- ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL, powerRequest.uListenInterval,
- NULL, eANI_BOOLEAN_FALSE);
+ { // we skip this registration for modes other than STA and P2P client modes.
+ status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
+ pAdapterNode = pNext;
+ continue;
+ }
- /* switch to the DTIM specified in cfg.ini */
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Switch to DTIM%d", powerRequest.uListenInterval);
- sme_SetPowerParams( pHddCtx->hHal, &powerRequest, TRUE);
+ //Apply Dynamic DTIM For P2P
+ //Only if ignoreDynamicDtimInP2pMode is not set in ini
+ if ((pHddCtx->cfg_ini->enableDynamicDTIM ||
+ pHddCtx->cfg_ini->enableModulatedDTIM) &&
+ ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
+ ((WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) &&
+ !(pHddCtx->cfg_ini->ignoreDynamicDtimInP2pMode))) &&
+ (eANI_BOOLEAN_TRUE == pAdapter->higherDtimTransition) &&
+ (eConnectionState_Associated ==
+ (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState) &&
+ (pHddCtx->cfg_ini->fIsBmpsEnabled))
+ {
+ tSirSetPowerParamsReq powerRequest = { 0 };
+ powerRequest.uIgnoreDTIM = 1;
+ powerRequest.uMaxLIModulatedDTIM = pHddCtx->cfg_ini->fMaxLIModulatedDTIM;
+
+ if (pHddCtx->cfg_ini->enableModulatedDTIM)
+ {
+ powerRequest.uDTIMPeriod = pHddCtx->cfg_ini->enableModulatedDTIM;
+ powerRequest.uListenInterval = pHddCtx->hdd_actual_LI_value;
+ }
+ else
+ {
+ powerRequest.uListenInterval = pHddCtx->cfg_ini->enableDynamicDTIM;
+ }
+
+ /* Update ignoreDTIM and ListedInterval in CFG to remain at the DTIM
+ * specified during Enter/Exit BMPS when LCD off*/
+ ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, powerRequest.uIgnoreDTIM,
+ NULL, eANI_BOOLEAN_FALSE);
+ ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL, powerRequest.uListenInterval,
+ NULL, eANI_BOOLEAN_FALSE);
+
+ /* switch to the DTIM specified in cfg.ini */
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "Switch to DTIM %d", powerRequest.uListenInterval);
+ sme_SetPowerParams( pHddCtx->hHal, &powerRequest, TRUE);
+ break;
+
+ }
+
+ status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
+ pAdapterNode = pNext;
+ }
}
void hdd_reset_pwrparams(hdd_context_t *pHddCtx)
@@ -3774,7 +3811,11 @@
//If bmps disabled enable it
if(VOS_STATUS_SUCCESS == exitbmpsStatus)
{
- hdd_enable_bmps_imps(pHddCtx);
+ if (pHddCtx->hdd_wlan_suspended)
+ {
+ hdd_set_pwrparams(pHddCtx);
+ }
+ hdd_enable_bmps_imps(pHddCtx);
}
return NULL;
}
@@ -3811,7 +3852,11 @@
((pHddCtx->no_of_sessions[VOS_STA_MODE] >= 1) ||
(pHddCtx->no_of_sessions[VOS_P2P_CLIENT_MODE] >= 1)))
{
- hdd_enable_bmps_imps(pHddCtx);
+ if (pHddCtx->hdd_wlan_suspended)
+ {
+ hdd_set_pwrparams(pHddCtx);
+ }
+ hdd_enable_bmps_imps(pHddCtx);
}
return VOS_STATUS_SUCCESS;
@@ -5040,6 +5085,7 @@
{
eHalStatus halStatus;
v_U32_t listenInterval;
+ tANI_U32 ignoreDtim;
// Send ready indication to the HDD. This will kick off the MAC
@@ -5052,12 +5098,15 @@
return VOS_STATUS_E_FAILURE;
}
- // Set default LI into HDD context,
+ // Set default LI and ignoreDtim into HDD context,
// otherwise under some race condition, HDD will set 0 LI value into RIVA,
// And RIVA will crash
wlan_cfgGetInt(pHddCtx->hHal, WNI_CFG_LISTEN_INTERVAL, &listenInterval);
pHddCtx->hdd_actual_LI_value = listenInterval;
-
+ wlan_cfgGetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, &ignoreDtim);
+ pHddCtx->hdd_actual_ignore_DTIM_value = ignoreDtim;
+
+
return VOS_STATUS_SUCCESS;
}
diff --git a/CORE/MAC/src/pe/lim/limSessionUtils.c b/CORE/MAC/src/pe/lim/limSessionUtils.c
index d6b0ef1..f528c87 100644
--- a/CORE/MAC/src/pe/lim/limSessionUtils.c
+++ b/CORE/MAC/src/pe/lim/limSessionUtils.c
@@ -1,50 +1,30 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-/*
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
+ * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
+ *
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+*/
/**=========================================================================
\file limSessionUtils.c
\brief implementation for lim Session Utility APIs
\author Sunit Bhatia
+ Copyright 2008 (c) Qualcomm Technologies, Inc. All Rights Reserved.
========================================================================*/
@@ -167,9 +147,15 @@
for(i = 0; i < pMac->lim.maxBssId; i++)
{
+ /* To order to check number of established sessions, we are currently chceking
+ * for eLIM_MLM_LINK_ESTABLISHED_STATE state along with this state we also need
+ * to consider the device is not in eLIM_SME_WT_DEAUTH_STATE beacuse the actual
+ * disconnection can be considered when DEL_STA_RESP is recived
+ */
if( (pMac->lim.gpSession[i].valid == TRUE)&&
(pMac->lim.gpSession[i].limSystemRole == eLIM_STA_ROLE)&&
- (pMac->lim.gpSession[i].limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE)) {
+ (pMac->lim.gpSession[i].limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE) &&
+ (pMac->lim.gpSession[i].limSmeState != eLIM_SME_WT_DEAUTH_STATE)) {
sessioncount++;
sessionId = i;