commit 42af178c61910be5a1256c9d6de5a1cfb18e8680
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Sun Oct 21 12:13:23 2012 -0700
committer Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 30 14:53:00 2012 -0800
tree dc80aa8214ebf886421f6cb44e0b03f5470a04e6
parent 74719a16a222cbbfa8723bd7e27b09a686214cba

wlan: Unable to connect if the AP sends country code as "I".

The problem was if the AP sends the country code as "I" then the
function csrMatchCountryCode compares the list of country code with the
country code present in the AP beacon. Since this country code is not
present the csr fails to connect to that AP which is causing the
problem.
The csrMatchCountry code has an issue that there is no need for
validation unless the fEnforceDefaultDomain and fEnforceCountryCodeMatch
is set to true in the WCSS_qcom_cfg.ini.

Change-Id: Ic85a0f44cf9de58db6e61efdce835ee8ac82ef57
CR-Fixed: 412676

CORE/SME/src/csr/csrUtil.c

diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 70f0456..e4086f6 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -5923,31 +5923,35 @@
             smsLog(pMac, LOGE, FL("  No IEs\n"));
             break;
         }
-        //Make sure this country is recognizable
-        if( pIes->Country.present )
+        if( pMac->roam.configParam.fEnforceDefaultDomain ||
+            pMac->roam.configParam.fEnforceCountryCodeMatch )
         {
-            status = csrGetRegulatoryDomainForCountry( pMac, pIes->Country.country, &domainId );
-            if( !HAL_STATUS_SUCCESS( status ) )
+            //Make sure this country is recognizable
+            if( pIes->Country.present )
             {
-                fRet = eANI_BOOLEAN_FALSE;
-                break;
+                status = csrGetRegulatoryDomainForCountry( pMac, pIes->Country.country, &domainId );
+                if( !HAL_STATUS_SUCCESS( status ) )
+                {
+                    fRet = eANI_BOOLEAN_FALSE;
+                    break;
+                }
             }
-        }
-        //check whether it is needed to enforce to the default regulatory domain first
-        if( pMac->roam.configParam.fEnforceDefaultDomain )
-        {
-            if( domainId != pMac->scan.domainIdCurrent )
+            //check whether it is needed to enforce to the default regulatory domain first
+            if( pMac->roam.configParam.fEnforceDefaultDomain )
             {
-                fRet = eANI_BOOLEAN_FALSE;
-                break;
+                if( domainId != pMac->scan.domainIdCurrent )
+                {
+                    fRet = eANI_BOOLEAN_FALSE;
+                    break;
+                }
             }
-        }
-        if( pMac->roam.configParam.fEnforceCountryCodeMatch )
-        {
+            if( pMac->roam.configParam.fEnforceCountryCodeMatch )
+            {
             if( domainId >= REGDOMAIN_COUNT )
-            {
-                fRet = eANI_BOOLEAN_FALSE;
-                break;
+                {
+                    fRet = eANI_BOOLEAN_FALSE;
+                    break;
+                }
             }
         }
         if( pCountry )