commit 6cc761cfbb3b0e459f7d93aba6c4d89191ae79c2
author Agarwal Ashish <ashishka@qti.qualcomm.com> Mon Aug 25 19:14:46 2014 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Thu Sep 04 11:59:29 2014 +0530
tree 49e4b4e5061206226f2873ab341871e436a24d44
parent afd4231ea581a6feac18062b34c816025d77cc3e

wlan: Remove Passive scan Restrication for non-zero Default CC & world reg.

When Country code in nv.bin file is Non-world and Reg Domain is world;
it's neither CUSTOM nor STRICT regulatory. In this case,
if country code is Non-world and domain is world; driver will not
change channel to Active.
Fixed this by adding check for US CC and World reg domain.

CRs-Fixed: 710980
Change-Id: Ie07248efed2d2333a7ee337c6729a695e6d6699e

CORE/VOSS/src/vos_nvitem.c

diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index c3c9324..324c669 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -3408,8 +3408,14 @@
             if (0 == err)
 #endif
             {
-                if  (wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
+                /* When Country code in nv.bin file is Non Zero  and Reg Domain
+                 * is world; it's neither CUSTOM nor STRICT. In this Case
+                 * if country code is Non-Zero and domain is world; driver
+                 * will not change channel to active.
+                 */
 
+                if  (!(wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY ))
+                {
                     if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
                     {
                         VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,