Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

qcacld-2.0: Add new country XA 

qcacld-3.0 to qcacld-2.0 propagation

Add new user country XA to regulatory tables. This is an 'engineered'
country for Japan that has channels 5150-5230 marked as passive.

Change-Id: I6c582bc0635ecae2c37b98d761f72f222c408d2f
CRS-Fixed: 1007217
This commit is contained in:
Rajeev Kumar Sirasanagandla 2016-06-21 17:43:09 +05:30 committed by L R
parent fd57b7f79b
commit 833f56b460
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/qcacld-2.0/CORE/SERVICES/WMA/regdomain.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
* Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -884,6 +884,9 @@ typedef struct ath_hal_reg_dmn_tables {
* - country definition: CTRY_ZIMBABWE
* - country string: ZW
* - country ID: 716
* - country definition: CTRY_XA
* - country string: XA
* - country ID: 4100
*/
enum CountryCode {
CTRY_ALBANIA = 8, /* Albania */
@ -1083,6 +1086,7 @@ enum CountryCode {
CTRY_JAPAN57 = 4057, /* Japan (J57) */
CTRY_JAPAN58 = 4058, /* Japan (J58) */
CTRY_JAPAN59 = 4059, /* Japan (J59) */
CTRY_XA = 4100, /* Japan KDDI */
/*
** "Special" codes for multiply defined countries, with the exception

4
drivers/net/wireless/qcacld-2.0/CORE/SERVICES/WMA/regdomain_common.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
* Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -463,6 +463,7 @@ static const REG_DMN_PAIR_MAPPING ahCmnRegDomainPairs[] = {
{MKK14_MKKA1, MKK14, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK1 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN58 },
{MKK15_MKKA1, MKK15, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN59 },
{MKK5_MKKA2, MKK5, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_XA },
/* These are super domains */
{WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0 },
@ -602,6 +603,7 @@ static const COUNTRY_CODE_TO_ENUM_RD ahCmnAllCountries[] = {
{CTRY_JAPAN57, MKK13_MKKB, "JP", "JAPAN57", YES, NO, NO, YES, YES, YES, YES, NO, 7000 },
{CTRY_JAPAN58, MKK14_MKKA1, "JP", "JAPAN58", YES, NO, NO, YES, YES, YES, YES, NO, 7000 },
{CTRY_JAPAN59, MKK15_MKKA1, "JP", "JAPAN59", YES, NO, NO, YES, YES, YES, YES, NO, 7000 },
{CTRY_XA, MKK5_MKKA2, "XA", "JAPAN PASSIVE", YES, NO, NO, YES, YES, YES, NO, NO, 7000 },
{CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN", YES, NO, YES, YES, YES, YES, YES, YES, 7000 },
{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN", YES, NO, YES, YES, YES, NO, NO, NO, 7000 },
{CTRY_KENYA, APL1_WORLD, "KE", "KENYA", YES, NO, YES, YES, YES, YES, YES, YES, 7000 },

1
drivers/net/wireless/qcacld-2.0/CORE/VOSS/src/vos_nvitem.c
View File

@ -428,6 +428,7 @@ static CountryInfoTable_t countryInfoTable =
{REGDOMAIN_ETSI, {'Y', 'T'}}, //MAYOTTE
{REGDOMAIN_ETSI, {'Z', 'A'}}, //SOUTH AFRICA
{REGDOMAIN_ETSI, {'Z', 'W'}}, //ZIMBABWE
{REGDOMAIN_JAPAN, {'X', 'A'}}, //JAPAN PASSIVE
}
};