Revert "Configure flag to debug remain on channel issues."
This reverts commit 84be234884b14fc80c689edb4a0ba023ed610edb.
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 3232b69..93e4049 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -4480,40 +4480,6 @@
fStatus = FALSE;
hddLog(LOGE, "Could not pass on WNI_BTC_ACTIVE_BT_LEN 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");
- }
-
- if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ASD_PROBE_INTERVAL,
- pConfig->gAsdProbeInterval, NULL,
- eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
- {
- fStatus = FALSE;
- hddLog(LOGE, "Could not pass on WNI_CFG_ASD_PROBE_INTERVAL to CCM");
- }
-
- if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ASD_TRIGGER_THRESHOLD,
- pConfig->gAsdTriggerThreshold, NULL,
- eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
- {
- fStatus = FALSE;
- hddLog(LOGE, "Could not pass on WNI_CFG_ASD_TRIGGER_THRESHOLD to CCM");
- }
-
- if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD,
- pConfig->gAsdRTTRssiHystThreshold, NULL,
- eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
- {
- fStatus = FALSE;
- hddLog(LOGE, "Could not pass on WNI_CFG_ASD_RSSI_HYST_THRESHOLD to CCM");
- }
return fStatus;
}
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index d8ed6bd..fad5ada 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -373,7 +373,6 @@
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 312
#define WNI_CFG_ASD_PROBE_INTERVAL 313
#define WNI_CFG_ASD_TRIGGER_THRESHOLD 314
-#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD 315
/*
* String parameter lengths
@@ -2613,14 +2612,6 @@
#define WNI_CFG_BTC_SAP_ACTIVE_BT_LEN_APMAX 250000
#define WNI_CFG_BTC_SAP_ACTIVE_BT_LEN_APDEF 90000
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_STAMIN 0
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_STAMAX 1
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_STADEF 0
-
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_APMIN 0
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_APMAX 1
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_APDEF 0
-
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN 0
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX 4294967295
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF 300
@@ -2653,10 +2644,10 @@
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_APMAX 100
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_APDEF 0
-#define CFG_PARAM_MAX_NUM 316
-#define CFG_AP_IBUF_MAX_SIZE 255
+#define CFG_PARAM_MAX_NUM 315
+#define CFG_AP_IBUF_MAX_SIZE 254
#define CFG_AP_SBUF_MAX_SIZE 3422
-#define CFG_STA_IBUF_MAX_SIZE 250
+#define CFG_STA_IBUF_MAX_SIZE 249
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index d2a224d..8865914 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -367,7 +367,6 @@
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 312
#define WNI_CFG_ASD_PROBE_INTERVAL 313
#define WNI_CFG_ASD_TRIGGER_THRESHOLD 314
-#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD 315
/*
* String parameter lengths
@@ -1694,10 +1693,6 @@
#define WNI_CFG_BTC_SAP_ACTIVE_BT_LEN_STAMAX 250000
#define WNI_CFG_BTC_SAP_ACTIVE_BT_LEN_STADEF 90000
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_STAMIN 0
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_STAMAX 1
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_STADEF 0
-
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN 0
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX 4294967295
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF 300
@@ -1714,8 +1709,8 @@
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_STAMAX 100
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD_STADEF 0
-#define CFG_PARAM_MAX_NUM 316
-#define CFG_STA_IBUF_MAX_SIZE 250
+#define CFG_PARAM_MAX_NUM 315
+#define CFG_STA_IBUF_MAX_SIZE 249
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c
index 515ec6b..41310b0 100644
--- a/CORE/MAC/src/cfg/cfgParamName.c
+++ b/CORE/MAC/src/cfg/cfgParamName.c
@@ -340,7 +340,6 @@
(unsigned char *)"BTC_ACTIVE_BT_LEN",
(unsigned char *)"BTC_SAP_ACTIVE_WLAN_LEN",
(unsigned char *)"BTC_SAP_ACTIVE_BT_LEN",
- (unsigned char *)"DEBUG_P2P_REMAIN_ON_CHANNEL",
(unsigned char *)"RMC_ACTION_PERIOD_FREQUENCY",
(unsigned char *)"ASD_PROBE_INTERVAL",
(unsigned char *)"ASD_TRIGGER_THRESHOLD",
@@ -348,3 +347,4 @@
};
+
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index 30c0892..a3f2eb0 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -4650,18 +4650,6 @@
*
*
-* Debug p2p remain on channel
-*
-WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL I 4 7
-V RW NP
-NONE
-0 1 0
-V RW NP
-NONE
-0 1 0
-*
-*
-
* RMC action period frequency (milli seconds)
*
WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY I 4 7
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index 764a7e0..5685e79 100644
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
Binary files differ