wlan: Set home away time depending on scan channel max time
Home away time is default value is set to 3 (minimum value)
and this value is modified based on the scan channel max time.
Home away time should be atleast sum of twice the RF switching time
and scan channel max time
Change-Id: I6740c81582e10ea50d82f3f14504987093f87ae5
CRs-Fixed: 505463
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index ad3311a..93ed12b 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1369,6 +1369,7 @@
{
tANI_U8 *value = command;
tANI_U16 maxTime = CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_DEFAULT;
+ tANI_U16 homeAwayTime = 0;
/* Move pointer to ahead of SETSCANCHANNELTIME<delimiter> */
value = value + 19;
@@ -1402,6 +1403,21 @@
"%s: Received Command to change channel max time = %d", __func__, maxTime);
pHddCtx->cfg_ini->nNeighborScanMaxChanTime = maxTime;
+
+ /* Home Away Time should be atleast equal to (MaxDwell time + (2*RFS)),
+ * where RFS is the RF Switching time. It is twice RFS to consider the
+ * time to go off channel and return to the home channel. */
+ homeAwayTime = sme_getRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal));
+ if (homeAwayTime < (maxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
+ "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)",
+ " Hence enforcing home away time to disable (0)",
+ __func__, homeAwayTime, (maxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));
+ homeAwayTime = 0;
+ pHddCtx->cfg_ini->nRoamScanHomeAwayTime = homeAwayTime;
+ sme_UpdateRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal), homeAwayTime, eANI_BOOLEAN_FALSE);
+ }
sme_setNeighborScanMaxChanTime((tHalHandle)(pHddCtx->hHal), maxTime);
}
else if (strncmp(command, "GETSCANCHANNELTIME", 18) == 0)
@@ -1640,6 +1656,7 @@
{
tANI_U8 *value = command;
tANI_U16 homeAwayTime = CFG_ROAM_SCAN_HOME_AWAY_TIME_DEFAULT;
+ tANI_U16 scanChannelMaxTime = 0;
/* Move pointer to ahead of SETSCANHOMEAWAYTIME<delimiter> */
/* input value is in units of msec */
@@ -1658,11 +1675,6 @@
goto exit;
}
- /*Currently Home Away Time has a MIN value of 3.
- * But, we sould allow the user to input Zero,
- * since we are using the value of Zero to disable
- * this and fallback to LFR1.5 behaviour.*/
- if (0 != homeAwayTime)
if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) ||
(homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX))
{
@@ -1678,8 +1690,24 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Received Command to Set scan away time = %d", __func__, homeAwayTime);
- pHddCtx->cfg_ini->nRoamScanHomeAwayTime = homeAwayTime;
- sme_UpdateRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal), homeAwayTime);
+ /* Home Away Time should be atleast equal to (MaxDwell time + (2*RFS)),
+ * where RFS is the RF Switching time. It is twice RFS to consider the
+ * time to go off channel and return to the home channel. */
+ scanChannelMaxTime = sme_getNeighborScanMaxChanTime((tHalHandle)(pHddCtx->hHal));
+ if (homeAwayTime < (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
+ "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)",
+ " Hence enforcing home away time to disable (0)",
+ __func__, homeAwayTime, (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));
+ homeAwayTime = 0;
+ }
+
+ if (pHddCtx->cfg_ini->nRoamScanHomeAwayTime != homeAwayTime)
+ {
+ pHddCtx->cfg_ini->nRoamScanHomeAwayTime = homeAwayTime;
+ sme_UpdateRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal), homeAwayTime, eANI_BOOLEAN_TRUE);
+ }
}
else if (strncmp(priv_data.buf, "GETSCANHOMEAWAYTIME", 19) == 0)
{