commit 8db1c9422236c8dae68b10fed81e3b689b352e13
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Thu Jan 10 15:24:29 2013 -0800
committer Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Sat Jan 12 17:26:29 2013 -0800
tree 16cb9f5eeff5ffd3acea2ce6908d711b70dc39a9
parent b750ba9329d7c5e565524016efce00738e6ae376

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

CORE/HDD/src/wlan_hdd_cfg.c

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;