commit 97a2d9966d66c3361d57ff1ba61d23f5b170a8c9
author Amar Singhal <asinghal@qca.qualcomm.com> Tue Nov 19 10:58:07 2013 -0800
committer Kiet Lam <kietl@codeaurora.org> Mon Nov 25 22:34:39 2013 -0800
tree b57fb860d9b25744a2c90ac45682d9ce6989ca38
parent 247f9b1078567a6cab1c9564e9eb9f93e21bac61

wlan: Do not add new country when STA is associated.

When the userspace country priority is not set in INI, and the station is
associated, do not honor the userspace country setting rule.

Change-Id: Ia3a86a84ed9a6a2481d61e6401d6f47dbad5e822
CRs-Fixed: 570694

CORE/SME/src/sme_common/sme_Api.c

diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 91d78c2..375b4ef 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -4831,6 +4831,18 @@
    if ( HAL_STATUS_SUCCESS( status ) )
    {
       smsLog(pMac, LOG1, FL(" called"));
+
+      if ((csrGetInfraSessionId(pMac) != -1) &&
+          (!pMac->roam.configParam.fSupplicantCountryCodeHasPriority))
+      {
+
+          smsLog(pMac, LOGW, "Set Country Code Fail since the STA is associated and userspace does not have priority ");
+
+	  sme_ReleaseGlobalLock( &pMac->sme );
+          status = eHAL_STATUS_FAILURE;
+          return status;
+      }
+
       pMsg = vos_mem_malloc(sizeof(tAniChangeCountryCodeReq));
       if ( NULL == pMsg )
       {
@@ -7205,6 +7217,22 @@
         is11dCountry = VOS_TRUE;
     }
 
+    if ((!is11dCountry) && (!pMac->roam.configParam.fSupplicantCountryCodeHasPriority) &&
+        (csrGetInfraSessionId(pMac) != -1 ))
+    {
+
+        smsLog( pMac, LOGW, FL(" incorrect country being set, nullify this request"));
+
+        /* we have got a request for a country that should not have been added since the
+           STA is associated; nullify this request */
+        status = csrGetRegulatoryDomainForCountry(pMac,
+                                                  pMac->scan.countryCode11d,
+                                                  (v_REGDOMAIN_t *) &reg_domain_id,
+                                                  COUNTRY_IE);
+
+        return eHAL_STATUS_FAILURE;
+    }
+
     /* if Supplicant country code has priority, disable 11d */
     if (!is11dCountry && pMac->roam.configParam.fSupplicantCountryCodeHasPriority)
     {