commit 911463f5764c8e1cfa2ccffad742d4bda977f3a8
author Leela Venkata Kiran Kumar Reddy Chirala <kchirala@qca.qualcomm.com> Fri Feb 22 18:01:15 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Tue Feb 26 00:54:31 2013 -0800
tree c261757c4cce9839401aa91df2fe7705b1aaf2b3
parent fd59f695196629ea35ce4e3faa3b357446f9563c

Update WCNSS_qcom_cfg.ini values for specific OEM

change the default values of different params in the ini file
as per the requirement of specific OEM

Change-Id: I4d9d232fc13a3310c26046a170d29fd5b8e17483
CRs-fixed: 455659

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 f4c1927..e1a966d 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1234,7 +1234,7 @@
 #define CFG_REPORT_MAX_LINK_SPEED                  "gReportMaxLinkSpeed"
 #define CFG_REPORT_MAX_LINK_SPEED_MIN              ( eHDD_LINK_SPEED_REPORT_ACTUAL )
 #define CFG_REPORT_MAX_LINK_SPEED_MAX              ( eHDD_LINK_SPEED_REPORT_MAX_SCALED )
-#define CFG_REPORT_MAX_LINK_SPEED_DEFAULT          ( eHDD_LINK_SPEED_REPORT_ACTUAL )
+#define CFG_REPORT_MAX_LINK_SPEED_DEFAULT          ( eHDD_LINK_SPEED_REPORT_MAX_SCALED )
 
 /*
  * RSSI Thresholds
@@ -1401,7 +1401,7 @@
 #define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_NAME       "gSkipDfsChannelInP2pSearch"
 #define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MIN        ( 0 )
 #define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MAX        ( 1 )
-#define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_DEFAULT    ( 0 )
+#define CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_DEFAULT    ( 1 )
 
 /*
  * Ignore Dynamic Dtim in case of P2P
@@ -1482,7 +1482,7 @@
 #define CFG_NUM_BUFF_ADVERT_NAME              "gNumBuffAdvert"
 #define CFG_NUM_BUFF_ADVERT_MIN               ( 0 )
 #define CFG_NUM_BUFF_ADVERT_MAX               ( 128 )
-#define CFG_NUM_BUFF_ADVERT_DEFAULT           ( 40 )
+#define CFG_NUM_BUFF_ADVERT_DEFAULT           ( 64 )
 
 /*
  * Allow MCC to modify config
@@ -1554,6 +1554,7 @@
 #define CFG_TDLS_RSSI_HYSTERESIS_MAX                ( 100 )
 #define CFG_TDLS_RSSI_HYSTERESIS_DEFAULT            ( 100 )
 
+<<<<<<< HEAD:CORE/HDD/inc/wlan_hdd_cfg.h
 #define CFG_TDLS_RSSI_TRIGGER_THRESHOLD             "gTDLSRSSITriggerThreshold"
 #define CFG_TDLS_RSSI_TRIGGER_THRESHOLD_MIN         ( -120 )
 #define CFG_TDLS_RSSI_TRIGGER_THRESHOLD_MAX         ( 100 )
@@ -1563,6 +1564,13 @@
 #define CFG_TDLS_RSSI_TEARDOWN_THRESHOLD_MIN        ( -120 )
 #define CFG_TDLS_RSSI_TEARDOWN_THRESHOLD_MAX        ( 0 )
 #define CFG_TDLS_RSSI_TEARDOWN_THRESHOLD_DEFAULT    ( -75 )
+=======
+#ifdef WLAN_ACTIVEMODE_OFFLOAD_FEATURE
+#define CFG_ACTIVEMODE_OFFLOAD_ENABLE         "gEnableActiveModeOffload"
+#define CFG_ACTIVEMODE_OFFLOAD_ENABLE_MIN     ( 0 )
+#define CFG_ACTIVEMODE_OFFLOAD_ENABLE_MAX     ( 1 )
+#define CFG_ACTIVEMODE_OFFLOAD_ENABLE_DEFAULT ( 1 )
+>>>>>>> 9d0a871... Update WCNSS_qcom_cfg.ini values for specific OEM:prima/CORE/HDD/inc/wlan_hdd_cfg.h
 #endif
 
 /* Enable/Disable LPWR Image(cMEM uBSP) Transition */