commit 640728a625be5d6664e754ad851559104dc148cd
author Srinivas Girigowda <c_sgirig@qca.qualcomm.com> Thu Mar 28 12:21:54 2013 -0700
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Mon Apr 01 15:00:05 2013 -0700
tree 39045e27c6d8dcf9eb8ae770a0258bfbbf577340
parent c9ca373ba978ae7c9d4a1336b54926c41e6fbd8a

wlan: feature check before enabling wiphy roaming capability flag

Check for LFR/CCX/11r feature before enabling the wiphy roaming
capability flag

Change-Id: Ib27b4d29c95c6868bd29c5e60a642b081be59c84
CRs-Fixed: 466813

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 060b7c1..62e3c0c 100755
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -550,8 +550,18 @@
                  |  WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL
                     | WIPHY_FLAG_OFFCHAN_TX;
 #endif
+#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+    if (pCfg->isFastTransitionEnabled
 #ifdef FEATURE_WLAN_LFR
-    wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
+       || pCfg->isFastRoamIniFeatureEnabled
+#endif
+#ifdef FEATURE_WLAN_CCX
+       || pCfg->isCcxIniFeatureEnabled
+#endif
+    )
+    {
+        wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
+    }
 #endif
 #ifdef FEATURE_WLAN_TDLS
     wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS