wlan: CFG paramters related to HT40 on 2.4GHz
Configuration parameters added as part of the feature
HT40 on 2.4Ghz.
- WNI_CFG_CHANNEL_BONDING_24G
OBSS Scan cfg parameters:
-WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME
-WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME
-WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL
-WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL
-WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL
-WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR
-WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD
Change-Id: Ie801542a27c40ee92d88b6c7365d0561efed7bd0
CRs-Fixed: 608188
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index 90e9931..b21d8c3 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -375,6 +375,14 @@
#define WNI_CFG_ASD_RTT_RSSI_HYST_THRESHOLD 314
#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 315
#define WNI_CFG_BTC_CTS2S_DURING_SCO 316
+#define WNI_CFG_CHANNEL_BONDING_24G 317
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME 318
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME 319
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL 320
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL 321
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL 322
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR 323
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD 324
/*
* String parameter lengths
@@ -2662,10 +2670,74 @@
#define WNI_CFG_BTC_CTS2S_DURING_SCO_APMAX 1
#define WNI_CFG_BTC_CTS2S_DURING_SCO_APDEF 0
-#define CFG_PARAM_MAX_NUM 317
-#define CFG_AP_IBUF_MAX_SIZE 256
+#define WNI_CFG_CHANNEL_BONDING_24G_STAMIN 0
+#define WNI_CFG_CHANNEL_BONDING_24G_STAMAX 1
+#define WNI_CFG_CHANNEL_BONDING_24G_STADEF 0
+
+#define WNI_CFG_CHANNEL_BONDING_24G_APMIN 0
+#define WNI_CFG_CHANNEL_BONDING_24G_APMAX 1
+#define WNI_CFG_CHANNEL_BONDING_24G_APDEF 0
+
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMIN 5
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMAX 1000
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STADEF 20
+
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_APMIN 5
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_APMAX 1000
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_APDEF 20
+
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMIN 10
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMAX 1000
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STADEF 10
+
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_APMIN 10
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_APMAX 1000
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_APDEF 10
+
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMIN 10
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMAX 900
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STADEF 200
+
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_APMIN 10
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_APMAX 900
+#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_APDEF 200
+
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMIN 200
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMAX 10000
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STADEF 200
+
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_APMIN 200
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_APMAX 10000
+#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_APDEF 200
+
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMIN 20
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMAX 10000
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STADEF 20
+
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_APMIN 20
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_APMAX 10000
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_APDEF 20
+
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR_STAMIN 5
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR_STAMAX 100
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR_STADEF 5
+
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR_APMIN 5
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR_APMAX 100
+#define WNI_CFG_OBSS_HT40_WIDTH_CHANNEL_TRANSITION_DELAY_FACTOR_APDEF 5
+
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMIN 0
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMAX 100
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STADEF 25
+
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_APMIN 0
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_APMAX 100
+#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_APDEF 25
+
+#define CFG_PARAM_MAX_NUM 325
+#define CFG_AP_IBUF_MAX_SIZE 264
#define CFG_AP_SBUF_MAX_SIZE 3422
-#define CFG_STA_IBUF_MAX_SIZE 251
+#define CFG_STA_IBUF_MAX_SIZE 259
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19