wlan: update signed cfg.dat parameters appropriately.
While updating cfg parameter consider type of the parameter
and update accordingly.
Update gAsdTriggerThreshold cfg parameter appropriately.
Change-Id: I46c43f6bae42b054d82832a56a9857e25ae7d827
CRs-Fixed: 769116
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 5e82fb2..56cdab8 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2809,7 +2809,7 @@
#endif
char overrideCountryCode[4];
v_U32_t gAsdProbeInterval;
- v_U32_t gAsdTriggerThreshold;
+ v_S7_t gAsdTriggerThreshold;
v_U32_t gAsdRTTRssiHystThreshold;
v_BOOL_t debugP2pRemainOnChannel;
v_U32_t cfgBtcCTS2SduringSCO;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index f53e85e..ef1b2a6 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -2904,7 +2904,7 @@
CFG_ASD_PROBE_INTERVAL_MIN,
CFG_ASD_PROBE_INTERVAL_MAX),
- REG_VARIABLE( CFG_ASD_TRIGGER_THRESHOLD_NAME, WLAN_PARAM_Integer,
+ REG_VARIABLE( CFG_ASD_TRIGGER_THRESHOLD_NAME, WLAN_PARAM_SignedInteger,
hdd_config_t, gAsdTriggerThreshold,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_ASD_TRIGGER_THRESHOLD_DEFAULT,
@@ -3612,7 +3612,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [overrideCountryCode] Value = [%s] ",pHddCtx->cfg_ini->overrideCountryCode);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAsdProbeInterval] Value = [%u]",pHddCtx->cfg_ini->gAsdProbeInterval);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAsdTriggerThreshold] Value = [%u]",pHddCtx->cfg_ini->gAsdTriggerThreshold);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAsdTriggerThreshold] Value = [%hhd]",pHddCtx->cfg_ini->gAsdTriggerThreshold);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAsdRTTRssiHystThreshold]Value = [%u]",pHddCtx->cfg_ini->gAsdRTTRssiHystThreshold);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gRoamtoDFSChannel] Value = [%u] ",pHddCtx->cfg_ini->allowDFSChannelRoam);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxConcurrentActiveSessions] Value = [%u] ", pHddCtx->cfg_ini->gMaxConcurrentActiveSessions);
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index b7fc34a..f9cbb3e 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -2644,13 +2644,13 @@
#define WNI_CFG_ASD_PROBE_INTERVAL_APMAX 100
#define WNI_CFG_ASD_PROBE_INTERVAL_APDEF 50
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMIN 0
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMAX 120
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STADEF 45
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMIN -120
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMAX 0
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STADEF -75
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_APMIN 0
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_APMAX 120
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_APDEF 45
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_APMIN -120
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_APMAX 0
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_APDEF -75
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_STAMIN 0
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_STAMAX 100
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index 4cf0894..8785e3f 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -1717,9 +1717,9 @@
#define WNI_CFG_ASD_PROBE_INTERVAL_STAMAX 100
#define WNI_CFG_ASD_PROBE_INTERVAL_STADEF 50
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMIN 0
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMAX 120
-#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STADEF 45
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMIN -120
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STAMAX 0
+#define WNI_CFG_ASD_TRIGGER_THRESHOLD_STADEF -75
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_STAMIN 0
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_STAMAX 100
diff --git a/CORE/MAC/src/cfg/cfgApi.c b/CORE/MAC/src/cfg/cfgApi.c
index a9ea14a..4fa4bc5 100644
--- a/CORE/MAC/src/cfg/cfgApi.c
+++ b/CORE/MAC/src/cfg/cfgApi.c
@@ -232,10 +232,20 @@
PELOGE(cfgLog(pMac, LOGE, FL("Not valid cfg id %d"), cfgId);)
retVal = eSIR_CFG_INVALID_ID;
}
- else if ((pMac->cfg.gCfgIBufMin[index] > value) ||
- (pMac->cfg.gCfgIBufMax[index] < value))
+ else if ((pMac->cfg.gCfgIBufMin[index] < pMac->cfg.gCfgIBufMax[index]) &&
+ ((pMac->cfg.gCfgIBufMin[index] > value) ||
+ (pMac->cfg.gCfgIBufMax[index] < value)))
{
- PELOGE(cfgLog(pMac, LOGE, FL("Value %d out of range [%d,%d] cfg id %d"),
+ PELOGE(cfgLog(pMac, LOGE, FL("Value %u out of range [%u,%u] cfgid %hu"),
+ value, pMac->cfg.gCfgIBufMin[index],
+ pMac->cfg.gCfgIBufMax[index], cfgId);)
+ retVal = eSIR_CFG_INVALID_ID;
+ }
+ else if (!(pMac->cfg.gCfgIBufMin[index] < pMac->cfg.gCfgIBufMax[index]) &&
+ (((tANI_S32)(pMac->cfg.gCfgIBufMin[index]) > (tANI_S32)value) ||
+ ((tANI_S32)(pMac->cfg.gCfgIBufMax[index]) < (tANI_S32)value)))
+ {
+ PELOGE(cfgLog(pMac, LOGE, FL("Value %d out of range [%d,%d] cfgid %hu"),
value, pMac->cfg.gCfgIBufMin[index],
pMac->cfg.gCfgIBufMax[index], cfgId);)
retVal = eSIR_CFG_INVALID_ID;