wlan: Add support to double dwell time based on channel count
Double scan channel dwell time if the number of channels to scan
are less than preconfigured value. This will enable framework
to use selective scan in case of saved profiles during wlan
initialization.
Change-Id: I98ba44cb2b6746d7645da3c406e21b6cbcaaab49
CRs-Fixed: 956989
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index a6cbc61..96efd9d 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2621,6 +2621,11 @@
#define CFG_WIFI_CONFIG_MAX (1)
#define CFG_WIFI_CONFIG_DEFAULT (1)
+#define CFG_MAXCHAN_FOR_CHANTIME_CORR_NAME "gMaxChannelForMoreDwellTime"
+#define CFG_MAXCHAN_FOR_CHANTIME_CORR_MIN (0)
+#define CFG_MAXCHAN_FOR_CHANTIME_CORR_MAX (35)
+#define CFG_MAXCHAN_FOR_CHANTIME_CORR_DEFAULT (10)
+
/*---------------------------------------------------------------------------
Type declarations
@@ -3149,6 +3154,7 @@
v_BOOL_t crash_inject_enabled;
v_U32_t enable_delack;
v_BOOL_t disableBarWakeUp;
+ v_U8_t max_chan_for_dwell_time_cfg;
} hdd_config_t;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 5c78282..a38ba22 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3496,6 +3496,13 @@
CFG_DISABLE_BAR_WAKEUP_HOST_DEFAULT,
CFG_DISABLE_BAR_WAKEUP_HOST_MIN,
CFG_DISABLE_BAR_WAKEUP_HOST_MAX),
+
+ REG_VARIABLE( CFG_MAXCHAN_FOR_CHANTIME_CORR_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, max_chan_for_dwell_time_cfg,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_MAXCHAN_FOR_CHANTIME_CORR_DEFAULT,
+ CFG_MAXCHAN_FOR_CHANTIME_CORR_MIN,
+ CFG_MAXCHAN_FOR_CHANTIME_CORR_MAX ),
};
/*
@@ -3939,6 +3946,9 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
"Name = [disableBarWakeUp] Value = [%u] ",
pHddCtx->cfg_ini->disableBarWakeUp);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Name = [gMaxChannelForMoreDwellTime] Value = [%u] ",
+ pHddCtx->cfg_ini->max_chan_for_dwell_time_cfg);
}
@@ -5786,6 +5796,8 @@
smeConfig->fDeferIMPSTime = pHddCtx->cfg_ini->deferImpsTime;
smeConfig->fBtcEnableIndTimerVal = pHddCtx->cfg_ini->btcEnableIndTimerVal;
smeConfig->csrConfig.roamDelayStatsEnabled = pHddCtx->cfg_ini->gEnableRoamDelayStats;
+ smeConfig->csrConfig.max_chan_for_dwell_time_cfg =
+ pHddCtx->cfg_ini->max_chan_for_dwell_time_cfg;
vos_set_multicast_logging(pHddCtx->cfg_ini->multicast_host_msgs);
halStatus = sme_UpdateConfig( pHddCtx->hHal, smeConfig);
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index c5cd2d1..e802f26 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1195,6 +1195,7 @@
tANI_BOOLEAN ignorePeerHTopMode;
tANI_BOOLEAN disableP2PMacSpoofing;
tANI_BOOLEAN enableFatalEvent;
+ tANI_U8 max_chan_for_dwell_time_cfg;
}tCsrConfigParam;
//Tush
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index f27aec0..358d442 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -686,6 +686,7 @@
tANI_BOOLEAN ignorePeerHTopMode;
tANI_BOOLEAN disableP2PMacSpoofing;
tANI_BOOLEAN enableFatalEvent;
+ tANI_U8 max_chan_for_dwell_time_cfg;
}tCsrConfig;
typedef struct tagCsrChannelPowerInfo
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 1a8059c..bcc0245 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1965,6 +1965,8 @@
pMac->roam.configParam.apHT40_24GEnabled = pParam->apHT40_24GEnabled;
#endif
pMac->roam.configParam.roamDelayStatsEnabled = pParam->roamDelayStatsEnabled;
+ pMac->roam.configParam.max_chan_for_dwell_time_cfg =
+ pParam->max_chan_for_dwell_time_cfg;
}
return status;
@@ -2118,6 +2120,8 @@
#ifdef WLAN_FEATURE_AP_HT40_24G
pParam->apHT40_24GEnabled = pMac->roam.configParam.apHT40_24GEnabled;
#endif
+ pParam->max_chan_for_dwell_time_cfg =
+ pMac->roam.configParam.max_chan_for_dwell_time_cfg;
status = eHAL_STATUS_SUCCESS;
}
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 2d35eaa..4fb7eea 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -803,6 +803,23 @@
"dwell time for first scan %u"),
scanReq.maxChnTime);
}
+ if (!(pScanRequest->p2pSearch)
+ &&(pScanRequest->ChannelInfo.numOfChannels
+ < pMac->roam.configParam.
+ max_chan_for_dwell_time_cfg))
+ {
+ pScanRequest->maxChnTime =
+ pScanRequest->maxChnTime << 1;
+ pScanRequest->minChnTime =
+ pScanRequest->minChnTime << 1;
+ smsLog(pMac, LOG1,
+ FL("Double ChnTime (Max=%d Min=%d) numOfChannels=%d max_chan_for_dwell_time_cfg=%d"),
+ pScanRequest->maxChnTime,
+ pScanRequest->minChnTime,
+ pScanRequest->ChannelInfo.numOfChannels,
+ pMac->roam.configParam.
+ max_chan_for_dwell_time_cfg);
+ }
status = csrScanCopyRequest(pMac, &p11dScanCmd->u.scanCmd.u.scanRequest, &scanReq);
//Free the channel list
@@ -863,6 +880,19 @@
pScanRequest->maxChnTime);
}
+ if (!(pScanRequest->p2pSearch)
+ && (pScanRequest->ChannelInfo.numOfChannels
+ < pMac->roam.configParam.max_chan_for_dwell_time_cfg))
+ {
+ pScanRequest->maxChnTime = pScanRequest->maxChnTime << 1;
+ pScanRequest->minChnTime = pScanRequest->minChnTime << 1;
+ smsLog(pMac, LOG1,
+ FL("Double ChnTime (Max=%d Min=%d) numOfChannels=%d max_chan_for_dwell_time_cfg=%d"),
+ pScanRequest->maxChnTime,
+ pScanRequest->minChnTime,
+ pScanRequest->ChannelInfo.numOfChannels,
+ pMac->roam.configParam.max_chan_for_dwell_time_cfg);
+ }
status = csrScanCopyRequest(pMac, &pScanCmd->u.scanCmd.u.scanRequest, pScanRequest);
if(HAL_STATUS_SUCCESS(status))
{