diff options
| author | Jeff Johnson <jjohnson@codeaurora.org> | 2016-08-29 16:37:15 -0700 |
|---|---|---|
| committer | Jeff Johnson <jjohnson@codeaurora.org> | 2016-09-15 09:41:29 -0700 |
| commit | 291af6a2aaa773309f0d75be55872c6c8179ff78 (patch) | |
| tree | 1518e92e22c9ca77e1616762802fe1d596a585f7 | |
| parent | d404d03538e724da995f201f300a435a15889dd3 (diff) | |
qcacld-3.0: Remove obsolete RRM "max duration" configuration
Currently cfg.ini supports the following configuration items:
gRrmOperChanMax
gRrmNonOperChanMax
However these configuration items are no longer in use, so remove
them.
Change-Id: Ib6f1ea0b86d97132ebf58b09ad1699efc96e592f
CRs-Fixed: 1060775
| -rw-r--r-- | core/hdd/inc/wlan_hdd_cfg.h | 12 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg.c | 16 |
2 files changed, 0 insertions, 28 deletions
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index c38b9be2512b..3ef1bda303d8 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -825,16 +825,6 @@ typedef enum { #define CFG_RRM_ENABLE_MAX (1) #define CFG_RRM_ENABLE_DEFAULT (0) -#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_NAME "gRrmOperChanMax" /* section 11.10.3 IEEE std. 802.11k-2008 */ -#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_MIN (0) /* Maxduration = 2^(maxDuration - 4) * bcnIntvl. */ -#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_MAX (8) -#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_DEFAULT (3) /* max duration = 2^-1 * bcnIntvl (50% of bcn intvl) */ - -#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_NAME "gRrmNonOperChanMax" /* Same as above. */ -#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MIN (0) -#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MAX (8) -#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_DEFAULT (3) - #define CFG_RRM_MEAS_RANDOMIZATION_INTVL_NAME "gRrmRandnIntvl" #define CFG_RRM_MEAS_RANDOMIZATION_INTVL_MIN (10) #define CFG_RRM_MEAS_RANDOMIZATION_INTVL_MAX (100) @@ -3533,8 +3523,6 @@ struct hdd_config { bool fIsLowGainOverride; uint8_t disablePacketFilter; bool fRrmEnable; - uint8_t nInChanMeasMaxDuration; - uint8_t nOutChanMeasMaxDuration; uint16_t nRrmRandnIntvl; /* length includes separator */ char rm_capability[3 * DOT11F_IE_RRMENABLEDCAP_MAX_LEN]; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index ff35427bf847..f2313ca3351f 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -1280,22 +1280,6 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_RRM_ENABLE_MIN, CFG_RRM_ENABLE_MAX), - REG_VARIABLE(CFG_RRM_OPERATING_CHAN_MAX_DURATION_NAME, - WLAN_PARAM_Integer, - struct hdd_config, nInChanMeasMaxDuration, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_RRM_OPERATING_CHAN_MAX_DURATION_DEFAULT, - CFG_RRM_OPERATING_CHAN_MAX_DURATION_MIN, - CFG_RRM_OPERATING_CHAN_MAX_DURATION_MAX), - - REG_VARIABLE(CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_NAME, - WLAN_PARAM_Integer, - struct hdd_config, nOutChanMeasMaxDuration, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_DEFAULT, - CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MIN, - CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MAX), - REG_VARIABLE(CFG_RRM_MEAS_RANDOMIZATION_INTVL_NAME, WLAN_PARAM_Integer, struct hdd_config, nRrmRandnIntvl, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, |