commit 507ea5791db7ba6d95d9f9b7a5d9741775feb8cc
author Service qcabuildsw <qcabuildsw@localhost> Mon Sep 19 12:38:52 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 19 12:38:52 2016 -0700
tree b98f386f55f4bc17812c8f6ca0fb287c9cfc3bda
parent 751496b5a2a78f26c70729358db4b97a7eacec14
parent 9c9be7126c80f68d80ee99d82ecbdc6888135d9f

Merge "qcacld-3.0: Converge gDataInactivityTimeout default values" into wlan-cld3.driver.lnx.1.1-dev

core/hdd/inc/wlan_hdd_cfg.h

diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index af41715..8f27722 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -572,7 +572,7 @@
 #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)

core/mac/inc/wni_cfg.h

diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h
index ff9f7dd..f6d235d 100644
--- a/core/mac/inc/wni_cfg.h
+++ b/core/mac/inc/wni_cfg.h
@@ -408,7 +408,7 @@
 
 #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