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/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index cb1f929..5e94eec 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -838,7 +838,7 @@
#define CFG_ROAM_SCAN_HOME_AWAY_TIME "gRoamScanHomeAwayTime"
#define CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN (3)
#define CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX (300)
-#define CFG_ROAM_SCAN_HOME_AWAY_TIME_DEFAULT (0)
+#define CFG_ROAM_SCAN_HOME_AWAY_TIME_DEFAULT (CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN)
#endif /* (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) */
#ifdef FEATURE_WLAN_OKC
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 0c155c5..c3e55be 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -192,6 +192,7 @@
#endif
#define HDD_MAC_ADDR_LEN 6
+#define HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME 3
typedef v_U8_t tWlanHddMacAddr[HDD_MAC_ADDR_LEN];
typedef struct hdd_tx_rx_stats_s
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index a9c6f01..111fd8f 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -115,7 +115,23 @@
static void cbNotifySetRoamScanHomeAwayTime(hdd_context_t *pHddCtx, unsigned long NotifyId)
{
- sme_UpdateRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->nRoamScanHomeAwayTime);
+ tANI_U16 scanChannelMaxTime = 0;
+
+ /* 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 (pHddCtx->cfg_ini->nRoamScanHomeAwayTime < (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__, pHddCtx->cfg_ini->nRoamScanHomeAwayTime, (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));
+ pHddCtx->cfg_ini->nRoamScanHomeAwayTime = 0;
+ }
+
+ sme_UpdateRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->nRoamScanHomeAwayTime, eANI_BOOLEAN_TRUE);
}
#endif
@@ -181,7 +197,22 @@
static void cbNotifySetNeighborScanMaxChanTime(hdd_context_t *pHddCtx, unsigned long NotifyId)
{
- // at the point this routine is called, the value in the cfg_ini table has already been updated
+ tANI_U16 homeAwayTime = 0;
+
+ /* 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 < (pHddCtx->cfg_ini->nNeighborScanMaxChanTime + (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, (pHddCtx->cfg_ini->nNeighborScanMaxChanTime + (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), pHddCtx->cfg_ini->nNeighborScanMaxChanTime);
}
#endif
@@ -3984,6 +4015,16 @@
smeConfig.csrConfig.nRoamPrefer5GHz = pConfig->nRoamPrefer5GHz;
smeConfig.csrConfig.nRoamIntraBand = pConfig->nRoamIntraBand;
smeConfig.csrConfig.nProbes = pConfig->nProbes;
+
+ if (pConfig->nRoamScanHomeAwayTime < (pConfig->nNeighborScanMaxChanTime + (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__, pConfig->nRoamScanHomeAwayTime,
+ (pConfig->nNeighborScanMaxChanTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));
+ pConfig->nRoamScanHomeAwayTime = 0;
+ }
smeConfig.csrConfig.nRoamScanHomeAwayTime = pConfig->nRoamScanHomeAwayTime;
#endif
smeConfig.csrConfig.fFirstScanOnly2GChnl = pConfig->enableFirstScan2GOnly;
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)
{