prima: Reduce expiration time of traffic timer during roaming
Currently, traffic timer started for 8secs after successful connection to
allow for key completion and DHCP. As there is no DHCP during roaming,
this delay is not required. So, stop this timer during roaming and start a
timer of minimal duration to allow STA to enter power save immediately
after key completion.
Change-Id: I6c6111fc1aacb524da463914d357710a7f125f4a
CRs-Fixed: 868916
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 9aa5147..3a1bf9f 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -3305,7 +3305,6 @@
before the ENTER_BMPS_REQ ensures Listen Interval is
regained back to LI * Modulated DTIM */
hdd_set_pwrparams(pHddCtx);
- pHddStaCtx->hdd_ReassocScenario = VOS_FALSE;
/* At this point, device should not be in BMPS;
if due to unexpected scenario, if we are in BMPS,
@@ -3320,6 +3319,21 @@
eSME_FULL_PWR_NEEDED_BY_HDD);
}
}
+
+ if ((pHddCtx) &&
+ FULL_POWER == pmcGetPmcState(pHddCtx->hHal) &&
+ VOS_TRUE == pHddStaCtx->hdd_ReassocScenario)
+ {
+ hddLog( LOG1, FL("Device in full power."
+ "Stop and start traffic timer for roaming"));
+ pmcStopTrafficTimer(pHddCtx->hHal);
+ if (pmcStartTrafficTimer(pHddCtx->hHal,
+ TRAFFIC_TIMER_ROAMING) != eHAL_STATUS_SUCCESS)
+ {
+ hddLog(LOGP, FL("Cannot start traffic timer"));
+ }
+ }
+
halStatus = hdd_RoamSetKeyCompleteHandler( pAdapter, pRoamInfo, roamId, roamStatus, roamResult );
pHddStaCtx->hdd_ReassocScenario = FALSE;
}
diff --git a/CORE/SME/inc/pmcApi.h b/CORE/SME/inc/pmcApi.h
index 7cabdde..4a1915f 100644
--- a/CORE/SME/inc/pmcApi.h
+++ b/CORE/SME/inc/pmcApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -56,6 +56,11 @@
//should be large enough to allow the auth, DHCP handshake to complete
#define BMPS_TRAFFIC_TIMER_ALLOW_SECURITY_DHCP 8000 //unit = ms
+//This timer value is used to start the timer right after key completion
+//during roaming. This should be small enough to allow STA to enter PS
+//immediately after key completion as no DHCP phase during roaming.
+#define TRAFFIC_TIMER_ROAMING 100 //unit = ms
+
#define PMC_IS_CHIP_ACCESSIBLE(pmcState) ( (IMPS != (pmcState)) && (REQUEST_IMPS != (pmcState)) && \
(STANDBY != (pmcState)) && (REQUEST_STANDBY != (pmcState)) )