commit d83bd8f6281b5a7fb1da65897b78c3376e4f662b
author Kiet Lam <c_kietl@qca.qualcomm.com> Tue Jan 14 22:17:30 2014 -0800
committer Kiet Lam <c_kietl@qca.qualcomm.com> Tue Jan 14 22:17:30 2014 -0800
tree d8ce456b78ffd3715d6af289cbb3fb75b7c9da36
parent a060faa7d837945dd2716e08dfd111f569b18dba

Revert "Configure flag to debug remain on channel issues."

This reverts commit 74fd8793f20f1eb36a9a0f3eda3819bf3dbf34d8.

CORE/HDD/src/wlan_hdd_cfg.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index ecc3221..3232b69 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -2834,7 +2834,28 @@
    REG_VARIABLE_STRING( CFG_OVERRIDE_COUNTRY_CODE, WLAN_PARAM_String,
                 hdd_config_t, overrideCountryCode,
                 VAR_FLAGS_OPTIONAL,
-               (void *)CFG_OVERRIDE_COUNTRY_CODE_DEFAULT),
+                (void *)CFG_OVERRIDE_COUNTRY_CODE_DEFAULT),
+
+   REG_VARIABLE( CFG_ASD_PROBE_INTERVAL_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, gAsdProbeInterval,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ASD_PROBE_INTERVAL_DEFAULT,
+                 CFG_ASD_PROBE_INTERVAL_MIN,
+                 CFG_ASD_PROBE_INTERVAL_MAX),
+
+   REG_VARIABLE( CFG_ASD_TRIGGER_THRESHOLD_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, gAsdTriggerThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ASD_TRIGGER_THRESHOLD_DEFAULT,
+                 CFG_ASD_TRIGGER_THRESHOLD_MIN,
+                 CFG_ASD_TRIGGER_THRESHOLD_MAX),
+
+   REG_VARIABLE( CFG_ASD_RTT_RSSI_HYST_THRESHOLD_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, gAsdRTTRssiHystThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ASD_RTT_RSSI_HYST_THRESHOLD_DEFAULT,
+                 CFG_ASD_RTT_RSSI_HYST_THRESHOLD_MIN,
+                 CFG_ASD_RTT_RSSI_HYST_THRESHOLD_MAX),
 };
 
 
@@ -4493,16 +4514,6 @@
       fStatus = FALSE;
       hddLog(LOGE, "Could not pass on WNI_CFG_ASD_RSSI_HYST_THRESHOLD to CCM");
    }
-
-   if (ccmCfgSetInt(pHddCtx->hHal,
-                    WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL,
-                    pConfig->debugP2pRemainOnChannel,
-                    NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
-   {
-       fStatus = FALSE;
-       hddLog(LOGE,
-              "Could not pass on WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL to CCM");
-   }
    return fStatus;
 }