From 9c9be7126c80f68d80ee99d82ecbdc6888135d9f Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 2 Sep 2016 14:02:31 -0700 Subject: [PATCH] qcacld-3.0: Converge gDataInactivityTimeout default values There is a desire to remove unnecessary items from the default version of WCNSS_qcom_cfg.ini that is shipped to customers. Currently the default WCNSS_qcom_cfg.ini contains the following entry: gDataInactivityTimeout=200 The associated default value within the driver is: #define CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT (20) These are obviously divergent and should be converged. Note that this flag is used to change the value of the MAC CFG item WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, and this currently has the following default value: #define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STADEF 20 Since all recent testing has used the default WCNSS_qcom_cfg.ini, converge on the value defined there, 200, in all locations. Change-Id: I7895911708d5d17f73971254865da2cc177a3c5a CRs-Fixed: 1063037 --- core/hdd/inc/wlan_hdd_cfg.h | 2 +- core/mac/inc/wni_cfg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index af417155d138..8f27722f0331 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -572,7 +572,7 @@ typedef enum { #define CFG_DATA_INACTIVITY_TIMEOUT_NAME "gDataInactivityTimeout" #define CFG_DATA_INACTIVITY_TIMEOUT_MIN (1) #define CFG_DATA_INACTIVITY_TIMEOUT_MAX (255) -#define CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT (20) +#define CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT (200) #define CFG_RF_SETTLING_TIME_CLK_NAME "rfSettlingTimeUs" #define CFG_RF_SETTLING_TIME_CLK_MIN (0) diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h index ff9f7ddad79c..f6d235d7ba2d 100644 --- a/core/mac/inc/wni_cfg.h +++ b/core/mac/inc/wni_cfg.h @@ -408,7 +408,7 @@ enum { #define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMIN 1 #define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMAX 255 -#define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STADEF 20 +#define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STADEF 200 #define WNI_CFG_RF_SETTLING_TIME_CLK_STAMIN 0 #define WNI_CFG_RF_SETTLING_TIME_CLK_STAMAX 60000