commit bd3feb708cbec752fa43bcdade176d791b1d54ba
author Rashmi Ramanna <c_ramanr@qti.qualcomm.com> Tue Feb 25 16:14:48 2014 +0530
committer AnjaneeDevi Kapparapu <akappa@codeaurora.org> Fri Feb 28 08:50:23 2014 +0530
tree ffff9c95980bd48e3c1e8b8a7405eb1b4f7aa81f
parent facf5e2de5cf610b8720da02bbd38dd1d7856ab7

wlan: Add configuration variable to advertise concurrent operation.

Configuration parameter "gAdvertiseConcurrentOperation" is added in
WCNSS_qcom_cfg.ini file to enable/disable concurrent operation
advertisement to supplicant.
Setting this parameter to 0 disables advertisement of concurrent
operation to supplicant.

CRs-Fixed: 622682
Change-Id: I1d79c7abed135c216b9004dde8809b100da7cdea

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f83b494..49a2abe 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -782,19 +782,22 @@
                              | BIT(NL80211_IFTYPE_P2P_GO)
                              | BIT(NL80211_IFTYPE_AP);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-    if( pCfg->enableMCC )
+    if( pCfg->advertiseConcurrentOperation )
     {
-        /* Currently, supports up to two channels */
-        wlan_hdd_iface_combination.num_different_channels = 2;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+        if( pCfg->enableMCC )
+        {
+            /* Currently, supports up to two channels */
+            wlan_hdd_iface_combination.num_different_channels = 2;
 
-        if( !pCfg->allowMCCGODiffBI )
-            wlan_hdd_iface_combination.beacon_int_infra_match = true;
+            if( !pCfg->allowMCCGODiffBI )
+                wlan_hdd_iface_combination.beacon_int_infra_match = true;
 
-    }
-    wiphy->iface_combinations = &wlan_hdd_iface_combination;
-    wiphy->n_iface_combinations = 1;
+        }
+        wiphy->iface_combinations = &wlan_hdd_iface_combination;
+        wiphy->n_iface_combinations = 1;
 #endif
+    }
 
     /* Before registering we need to update the ht capabilitied based
      * on ini values*/