summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMahesh A Saptasagar <c_msapta@qti.qualcomm.com>2016-02-02 19:18:50 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-02-08 14:59:00 +0530
commit51ec504ed7d83466466e165977a289aec0e4bd60 (patch)
treea6cb16a63d7cadd5811cc1f86322bdf727ca5c66
parent95a871c00251e4745c50d1b068095af47d099ffc (diff)
qcacld-2.0: Map non-FCC Countries to proper reg id
prima to qcacld-2.0 propagation. Some non FCC countries are mapped to FCC. When these country are set, host sends regdomain as FCC to firmware. Now if channel 9 is set with secondary channel offset above primary (HT40+ mode), the firmware returns failure as this combination is not allowed in FCC. Map non-FCC countries to proper reg id in countryInfoTable. Change-Id: I85313c1ce97e55b70dae1b28c91b4e703f5c7851 CRs-Fixed: 957368
-rw-r--r--CORE/VOSS/src/vos_nvitem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 2e9f3266e140..c4b44b66a39d 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -255,7 +255,7 @@ static CountryInfoTable_t countryInfoTable =
{REGDOMAIN_FCC, {'G', 'T'}}, //GUATEMALA
{REGDOMAIN_FCC, {'G', 'U'}}, //GUAM
{REGDOMAIN_ETSI, {'H', 'U'}}, //HUNGARY
- {REGDOMAIN_FCC, {'I', 'D'}}, //INDONESIA
+ {REGDOMAIN_ETSI, {'I', 'D'}}, //INDONESIA
{REGDOMAIN_ETSI, {'I', 'E'}}, //IRELAND
{REGDOMAIN_ETSI, {'I', 'L'}}, //ISRAEL
{REGDOMAIN_ETSI, {'I', 'N'}}, //INDIA
@@ -325,12 +325,12 @@ static CountryInfoTable_t countryInfoTable =
{REGDOMAIN_ETSI, {'T', 'R'}}, //TURKEY
{REGDOMAIN_ETSI, {'T', 'T'}}, //TRINIDAD AND TOBAGO
{REGDOMAIN_FCC, {'T', 'W'}}, //TAIWAN, PRIVINCE OF CHINA
- {REGDOMAIN_FCC, {'T', 'Z'}}, //TANZANIA, UNITED REPUBLIC OF
+ {REGDOMAIN_ETSI, {'T', 'Z'}}, //TANZANIA, UNITED REPUBLIC OF
{REGDOMAIN_ETSI, {'U', 'A'}}, //UKRAINE
{REGDOMAIN_ETSI, {'U', 'G'}}, //UGANDA
{REGDOMAIN_FCC, {'U', 'S'}}, //USA
{REGDOMAIN_ETSI, {'U', 'Y'}}, //URUGUAY
- {REGDOMAIN_FCC, {'U', 'Z'}}, //UZBEKISTAN
+ {REGDOMAIN_ETSI, {'U', 'Z'}}, //UZBEKISTAN
{REGDOMAIN_ETSI, {'V', 'E'}}, //VENEZUELA
{REGDOMAIN_FCC, {'V', 'I'}}, //VIRGIN ISLANDS, US
{REGDOMAIN_ETSI, {'V', 'N'}}, //VIETNAM