commit 918481c27039198a24e40e9b791ec91dc6f48689
author Leela V Kiran Kumar Reddy Chirala <kchirala@qca.qualcomm.com> Wed Feb 13 22:00:12 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Tue Feb 19 17:31:02 2013 -0800
tree 3e4188d32623e26489f96f0f7cd381824e14be25
parent c4b2561a07f5f4273deda331d7a1887065ba8219

Fix the conflicts of cfg.txt autogenerated files

The commit "Disable LDPC in sta mode when AP is TXBF capable"
overwrites the defines in header files.correct the defines
in the autogenerated header files

Change-Id: Ibbc2c1a699c3eaf01ded04ce614328931f7fdf3a

CORE/MAC/inc/wniCfgSta.h

diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index 3e7fa52..42b4991 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -348,9 +348,10 @@
 #define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    289
 #define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    290
 #define WNI_CFG_ENABLE_MC_ADDR_LIST    291
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    292
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    293
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    294
+#define WNI_CFG_ENABLE_UC_FILTER    292
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    293
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    294
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    295
 
 /*
  * String parameter lengths 
@@ -1255,7 +1256,7 @@
 
 #define WNI_CFG_NUM_BUFF_ADVERT_STAMIN    0
 #define WNI_CFG_NUM_BUFF_ADVERT_STAMAX    128
-#define WNI_CFG_NUM_BUFF_ADVERT_STADEF    45
+#define WNI_CFG_NUM_BUFF_ADVERT_STADEF    64
 
 #define WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMIN    0
 #define WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMAX    3
@@ -1588,6 +1589,10 @@
 #define WNI_CFG_ENABLE_MC_ADDR_LIST_STAMAX    1
 #define WNI_CFG_ENABLE_MC_ADDR_LIST_STADEF    0
 
+#define WNI_CFG_ENABLE_UC_FILTER_STAMIN    0
+#define WNI_CFG_ENABLE_UC_FILTER_STAMAX    1
+#define WNI_CFG_ENABLE_UC_FILTER_STADEF    0
+
 #define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN    0
 #define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX    1
 #define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF    0
@@ -1600,8 +1605,8 @@
 #define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMAX    1
 #define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STADEF    0
 
-#define CFG_PARAM_MAX_NUM        295
-#define CFG_STA_IBUF_MAX_SIZE    229
+#define CFG_PARAM_MAX_NUM        296
+#define CFG_STA_IBUF_MAX_SIZE    230
 #define CFG_STA_SBUF_MAX_SIZE    3388
 #define CFG_SEM_MAX_NUM          19