Parcourir la source

qcacld-3.0: Remove obsolete "enable close loop" configuration

Currently cfg.ini supports a "gEnableCloseLoop" configuration item,
and this is used to override the WNI_CFG_ENABLE_CLOSE_LOOP entry in
the MAC CFG database.  However this MAC CFG database entry is no
longer in use, so remove the obsolete support for this configuration
item.

Change-Id: Ic8b7f4f522e910476273dd428bbb471a19cbe79f
CRs-Fixed: 1060579
Jeff Johnson il y a 8 ans
Parent
commit
8db2d53dec

+ 0 - 6
core/hdd/inc/wlan_hdd_cfg.h

@@ -1073,11 +1073,6 @@ typedef enum {
 #define CFG_ENABLE_BEACON_EARLY_TERMINATION_MAX           (1)
 #define CFG_ENABLE_BEACON_EARLY_TERMINATION_DEFAULT       (0)
 
-#define CFG_ENABLE_CLOSE_LOOP_NAME                 "gEnableCloseLoop"
-#define CFG_ENABLE_CLOSE_LOOP_MIN                  WNI_CFG_FIXED_RATE_STAMIN
-#define CFG_ENABLE_CLOSE_LOOP_MAX                  WNI_CFG_FIXED_RATE_STAMAX
-#define CFG_ENABLE_CLOSE_LOOP_DEFAULT              WNI_CFG_FIXED_RATE_STADEF
-
 #define CFG_ENABLE_BYPASS_11D_NAME                 "gEnableBypass11d"
 #define CFG_ENABLE_BYPASS_11D_MIN                  (0)
 #define CFG_ENABLE_BYPASS_11D_MAX                  (1)
@@ -3776,7 +3771,6 @@ struct hdd_config {
 	uint16_t nTeleBcnTransLiNumIdleBeacons;
 	uint16_t nTeleBcnMaxLiNumIdleBeacons;
 	uint8_t bcnEarlyTermWakeInterval;
-	uint32_t enableCloseLoop;
 	uint8_t enableBypass11d;
 	uint8_t enableDFSChnlScan;
 	uint8_t enable_dfs_pno_chnl_scan;

+ 0 - 15
core/hdd/src/wlan_hdd_cfg.c

@@ -1840,13 +1840,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN,
 		     CFG_AP_DATA_AVAIL_POLL_PERIOD_MAX),
 
-	REG_VARIABLE(CFG_ENABLE_CLOSE_LOOP_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, enableCloseLoop,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_ENABLE_CLOSE_LOOP_DEFAULT,
-		     CFG_ENABLE_CLOSE_LOOP_MIN,
-		     CFG_ENABLE_CLOSE_LOOP_MAX),
-
 	REG_VARIABLE(CFG_ENABLE_BYPASS_11D_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, enableBypass11d,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -6602,14 +6595,6 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx)
 		       "Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD to CFG");
 	}
 
-	if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_CLOSE_LOOP,
-			    pConfig->enableCloseLoop) ==
-			QDF_STATUS_E_FAILURE) {
-		fStatus = false;
-		hddLog(LOGE,
-		       "Could not pass on WNI_CFG_ENABLE_CLOSE_LOOP to CFG");
-	}
-
 	if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TX_PWR_CTRL_ENABLE,
 			    pConfig->enableAutomaticTxPowerControl)
 			== QDF_STATUS_E_FAILURE) {

+ 0 - 5
core/mac/inc/wni_cfg.h

@@ -220,7 +220,6 @@ enum {
 	WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
 	WNI_CFG_ASSOC_STA_LIMIT,
 	WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD,
-	WNI_CFG_ENABLE_CLOSE_LOOP,
 	WNI_CFG_ENABLE_LTE_COEX,
 	WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
 	WNI_CFG_GO_KEEP_ALIVE_TIMEOUT,
@@ -1140,10 +1139,6 @@ enum {
 #define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMAX    65535
 #define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STADEF    5
 
-#define WNI_CFG_ENABLE_CLOSE_LOOP_STAMIN    0
-#define WNI_CFG_ENABLE_CLOSE_LOOP_STAMAX    1
-#define WNI_CFG_ENABLE_CLOSE_LOOP_STADEF    0
-
 #define WNI_CFG_ENABLE_LTE_COEX_STAMIN    0
 #define WNI_CFG_ENABLE_LTE_COEX_STAMAX    1
 #define WNI_CFG_ENABLE_LTE_COEX_STADEF    0

+ 1 - 2
core/mac/src/cfg/cfg_param_name.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -291,7 +291,6 @@ unsigned char *g_cfg_param_name[] = {
 	(unsigned char *)"SAP_CHANNEL_SELECT_END_CHANNEL",
 	(unsigned char *)"SAP_CHANNEL_SELECT_OPERATING_BAND",
 	(unsigned char *)"AP_DATA_AVAIL_POLL_PERIOD",
-	(unsigned char *)"ENABLE_CLOSE_LOOP",
 	(unsigned char *)"ENABLE_LTE_COEX",
 	(unsigned char *)"AP_KEEP_ALIVE_TIMEOUT",
 	(unsigned char *)"GO_KEEP_ALIVE_TIMEOUT",

+ 0 - 5
core/mac/src/cfg/cfg_proc_msg.c

@@ -1003,11 +1003,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMIN,
 	WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMAX,
 	WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STADEF},
-	{WNI_CFG_ENABLE_CLOSE_LOOP,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_ENABLE_CLOSE_LOOP_STAMIN,
-	WNI_CFG_ENABLE_CLOSE_LOOP_STAMAX,
-	WNI_CFG_ENABLE_CLOSE_LOOP_STADEF},
 	{WNI_CFG_ENABLE_LTE_COEX,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_ENABLE_LTE_COEX_STAMIN,