wlan: Fix the Max Tx power value in 5G band and .ini support for 11h
Fix the max tx power to 20 for 5G band in CFG.
Added .ini support for 11h enable/disable.
Disable 11h if the operating band is 2.4G.
CR-Fixed: 435807
Change-Id: Ifb82c8cd6226e9a6452d905f62859564a2e91552
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index ab3134a..f21a3f5 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -106,6 +106,11 @@
#define CFG_11D_SUPPORT_ENABLED_MAX WNI_CFG_11D_ENABLED_STAMAX
#define CFG_11D_SUPPORT_ENABLED_DEFAULT WNI_CFG_11D_ENABLED_STADEF // Default is ON
+#define CFG_11H_SUPPORT_ENABLED_NAME "g11hSupportEnabled"
+#define CFG_11H_SUPPORT_ENABLED_MIN ( 0 )
+#define CFG_11H_SUPPORT_ENABLED_MAX ( 1 )
+#define CFG_11H_SUPPORT_ENABLED_DEFAULT ( 1 ) // Default is ON
+
#define CFG_ENFORCE_11D_CHANNELS_NAME "gEnforce11dChannel"
#define CFG_ENFORCE_11D_CHANNELS_MIN ( 0 )
#define CFG_ENFORCE_11D_CHANNELS_MAX ( 1 )
@@ -1510,6 +1515,7 @@
v_U8_t OperatingChannel;
v_BOOL_t ShortSlotTimeEnabled;
v_BOOL_t Is11dSupportEnabled;
+ v_BOOL_t Is11hSupportEnabled;
v_BOOL_t fEnforce11dChannels;
v_BOOL_t fSupplicantCountryCodeHasPriority;
v_BOOL_t fEnforceCountryCodeMatch;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 6ab9bdd..e908d23 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -164,6 +164,13 @@
CFG_11D_SUPPORT_ENABLED_DEFAULT,
CFG_11D_SUPPORT_ENABLED_MIN,
CFG_11D_SUPPORT_ENABLED_MAX ),
+
+ REG_VARIABLE( CFG_11H_SUPPORT_ENABLED_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, Is11hSupportEnabled,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+ CFG_11H_SUPPORT_ENABLED_DEFAULT,
+ CFG_11H_SUPPORT_ENABLED_MIN,
+ CFG_11H_SUPPORT_ENABLED_MAX ),
REG_VARIABLE( CFG_ENFORCE_11D_CHANNELS_NAME, WLAN_PARAM_Integer,
hdd_config_t, fEnforce11dChannels,
@@ -3349,8 +3356,13 @@
smeConfig.csrConfig.AdHocChannel5G = 44;
smeConfig.csrConfig.ProprietaryRatesEnabled = 0;
smeConfig.csrConfig.HeartbeatThresh50 = 40;
- smeConfig.csrConfig.Is11hSupportEnabled = 1;
smeConfig.csrConfig.bandCapability = pConfig->nBandCapability;
+ if (pConfig->nBandCapability == eCSR_BAND_24)
+ {
+ smeConfig.csrConfig.Is11hSupportEnabled = 0;
+ } else {
+ smeConfig.csrConfig.Is11hSupportEnabled = pConfig->Is11hSupportEnabled;
+ }
smeConfig.csrConfig.cbChoice = 0;
smeConfig.csrConfig.bgScanInterval = 0;
smeConfig.csrConfig.eBand = pConfig->nBandCapability;
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index 69a9604..7fd1016 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -1242,10 +1242,10 @@
WNI_CFG_MAX_TX_POWER_5 S 128 8
V RW NP
NONE
-3 36 126 14
+3 36 126 20
V RW NP
NONE
-3 36 126 14
+3 36 126 20
*
* Cell size configurations. These are canned configurations for a specified
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index 88c5efa..5c7138f 100755
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
Binary files differ
diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini
index 33feb43..201ec71 100644
--- a/firmware_bin/WCNSS_qcom_cfg.ini
+++ b/firmware_bin/WCNSS_qcom_cfg.ini
@@ -154,6 +154,10 @@
g11dSupportEnabled=1
+# 802.11h support
+
+g11hSupportEnabled=1
+
# CCX Support and fast transition
CcxEnabled=0
FastTransitionEnabled=1