commit 5e32b967eaeef1c0a2f30e5804dd2e93abd50905
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Wed Nov 28 16:07:55 2012 -0800
committer Mohit Khanna <mkhanna@qca.qualcomm.com> Tue Dec 04 12:13:28 2012 -0800
tree 7060febe195ca6168f4255fc81aa5b5f1fa52f97
parent 69fc3adfb260c90c0f51e75b8cab6a4f8d9f7a09

wlan: 11r CR fix integrated from Dev/11r: CL657576, CL 657577, CL658596

11r functional in Open mode

Change-Id: I53d4ec6f42a87a34b1a76887f6ea18daf0633c65
CR-Fixed: 414160, 412790, 414160, 418066

CORE/SME/src/csr/csrNeighborRoam.c

diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index 6a5a673..75d6f36 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -2960,7 +2960,8 @@
             
 #ifdef WLAN_FEATURE_VOWIFI_11R
             // Based on the auth scheme tell if we are 11r
-            if ( csrIsAuthType11r( pMac->roam.roamSession[sessionId].connectedProfile.AuthType ) )
+            if ( csrIsAuthType11r( pMac->roam.roamSession[sessionId].connectedProfile.AuthType, 
+                                   pMac->roam.roamSession[sessionId].connectedProfile.MDID.mdiePresent))
             {
                 if (pMac->roam.configParam.isFastTransitionEnabled)
                     init_ft_flag = TRUE;
@@ -3407,7 +3408,7 @@
     return eANI_BOOLEAN_FALSE;
 }
 
-#ifdef WLAN_FEATURE_VOWIFI_11R
+#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(WLAN_FEATURE_NEIGHBOR_ROAMING)
 /* ---------------------------------------------------------------------------
 
     \fn csrNeighborRoamIs11rAssoc