Browse Source

qcacld-3.0: Add missing reg pairs in driver

Regpair for DM, DO, HN, JM, NA, PA, SN, XA are missing
which results in a crash.

Add regpair for country codes  DM, DO, HN, JM, NA, PA, SN, XA.

Change-Id: I6d29f16a549121b9588d6fb68b78e14375e8eb8e
CRs-Fixed: 2154385
Ashish Kumar Dhanotiya 7 years ago
parent
commit
7b1fe06cc7
2 changed files with 9 additions and 0 deletions
  1. 1 0
      core/cds/inc/cds_regdomain.h
  2. 8 0
      core/cds/src/cds_regdomain.c

+ 1 - 0
core/cds/inc/cds_regdomain.h

@@ -441,6 +441,7 @@ enum reg_domain {
 
 	WORLD = 0x0199,
 	FCCA = 0x0A10,
+	FCCB = 0x0B90,
 	MKKA = 0x0A40,
 	MKKC = 0x0A50,
 	ETSIC = 0x0C30,

+ 8 - 0
core/cds/src/cds_regdomain.c

@@ -77,6 +77,7 @@ static const struct reg_dmn_pair g_reg_dmn_pairs[] = {
 	{FCC1_WORLD, FCC1, WORLD, CTRY_DEFAULT},
 	{FCC2_WORLD, FCC2, WORLD, CTRY_DEFAULT},
 	{FCC2_ETSIC, FCC2, ETSIC, CTRY_DEFAULT},
+	{FCC2_FCCA, FCC2, FCCA, CTRY_DEFAULT},
 	{FCC3_FCCA, FCC3, FCCA, CTRY_DEFAULT},
 	{FCC3_WORLD, FCC3, WORLD, CTRY_DEFAULT},
 	{FCC3_ETSIC, FCC3, ETSIC, CTRY_DEFAULT},
@@ -89,6 +90,8 @@ static const struct reg_dmn_pair g_reg_dmn_pairs[] = {
 	{FCC9_FCCA, FCC9, FCCA, CTRY_DEFAULT},
 	{FCC10_FCCA, FCC10, FCCA, CTRY_DEFAULT},
 	{FCC11_WORLD, FCC11, WORLD, CTRY_DEFAULT},
+	{FCC13_WORLD, FCC13, WORLD, CTRY_DEFAULT},
+	{FCC14_FCCB, FCC14, FCCB, CTRY_DEFAULT},
 	{ETSI1_WORLD, ETSI1, WORLD, CTRY_DEFAULT},
 	{ETSI3_WORLD, ETSI3, WORLD, CTRY_DEFAULT},
 	{ETSI4_WORLD, ETSI4, WORLD, CTRY_DEFAULT},
@@ -112,6 +115,7 @@ static const struct reg_dmn_pair g_reg_dmn_pairs[] = {
 	{APL15_WORLD, APL15, WORLD, CTRY_DEFAULT},
 	{APL16_WORLD, APL16, WORLD, CTRY_DEFAULT},
 	{APL17_ETSID, APL17, WORLD, CTRY_DEFAULT},
+	{APL20_WORLD, APL20, WORLD, CTRY_DEFAULT},
 	{APL23_WORLD, APL23, WORLD, CTRY_DEFAULT},
 	{WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, CTRY_DEFAULT},
 	{WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, CTRY_DEFAULT},
@@ -127,6 +131,7 @@ static const struct reg_dmn_pair g_reg_dmn_pairs[] = {
 	{WORB_WORLD, WORB_WORLD, WORB_WORLD, CTRY_DEFAULT},
 	{WORC_WORLD, WORC_WORLD, WORC_WORLD, CTRY_DEFAULT},
 	{MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15},
+	{MKK5_MKKA2, MKK5, MKKA, CTRY_DEFAULT},
 };
 
 static const struct country_code_to_reg_dmn g_all_countries[] = {
@@ -316,6 +321,8 @@ static const struct reg_dmn g_reg_dmns[] = {
 	{FCC9, FCC},
 	{FCC10, FCC},
 	{FCC11, FCC},
+	{FCC13, FCC},
+	{FCC14, FCC},
 	{ETSI1, ETSI},
 	{ETSI2, ETSI},
 	{ETSI3, ETSI},
@@ -343,6 +350,7 @@ static const struct reg_dmn g_reg_dmns[] = {
 	{APL15, FCC},
 	{APL16, FCC},
 	{APL17, FCC},
+	{APL20, ETSI},
 	{APL23, ETSI},
 	{NULL1, NO_CTL},
 	{MKK3, MKK},