qcacmn: Update regdb with regulatory database version 27

Update regdb with QCA regulatory database version 27.

Modify APL19 with new channels, power and radar pattern.
Change country IN to APL19_ETSIC.
Create new reg-domain ETSI15.
Create new reg-domain pair ETSI15_WORLD.
Move CTRY_SAUDI_ARABIA to ETSI15_WORLD.
Add new country CTRY_MYANMAR.
Change CTRY_CHILE to FCC13_WORLD.
Change CTL value for reg-domain APL8 to 'FCC'.
Enable all bandwidths for country CTRY_COSTA_RICA.
Add new reg-domain pair ETSI10_FCCA.
Move country CTRY_UNITED_STATES to FCC3_FCCA for mobile.
Update regdb version field.
Fix alignments.

Change-Id: I23a7ce98010e15eab606d4910df87bec15abc5ea
CRs-Fixed: 2353872

umac/regulatory/core/src/reg_db.c

@@ -20,7 +20,7 @@
 /**
  * DOC: reg_db.c
  * This file implements QCA regulatory database.
- * Current implementation conforms to database version 26
+ * Current implementation conforms to database version 27.
  */
 
 #include <qdf_types.h>
@@ -35,6 +35,7 @@ enum country_code {
 	CTRY_ANGUILLA = 660,
 	CTRY_ARGENTINA = 32,
 	CTRY_ARMENIA = 51,
+	CTRY_MYANMAR = 104,
 	CTRY_ARUBA = 533,
 	CTRY_AUSTRALIA = 36,
 	CTRY_AUSTRIA = 40,
@@ -231,10 +232,12 @@ enum reg_domain {
 	ETSI8_WORLD = 0x3D,
 	ETSI9_WORLD = 0x3E,
 	ETSI10_WORLD = 0x24,
+	ETSI10_FCCA = 0x25,
 	ETSI11_WORLD = 0x26,
 	ETSI12_WORLD = 0x28,
 	ETSI13_WORLD = 0x27,
 	ETSI14_WORLD = 0x29,
+	ETSI15_WORLD = 0x31,
 
 	APL1_WORLD = 0x52,
 	APL1_ETSIC = 0x55,
@@ -309,11 +312,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", 40, 160, 0},
 	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", 40, 40, 0},
 	{CTRY_CHAD, ETSI1_WORLD, "TD", 40, 160, 0},
-	{CTRY_CHILE, APL23_WORLD, "CL", 40, 160, 0},
+	{CTRY_CHILE, FCC13_WORLD, "CL", 40, 160, 0},
 	{CTRY_CHINA, APL14_WORLD, "CN", 40, 160, 0},
 	{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", 40, 160, 0},
 	{CTRY_COLOMBIA, FCC3_WORLD, "CO", 40, 160, 0},
-	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 20, 0},
+	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 160, 0},
 	{CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", 40, 160, 0},
 	{CTRY_CROATIA, ETSI1_WORLD, "HR", 40, 160, 0},
 	{CTRY_CYPRUS, ETSI1_WORLD, "CY", 40, 160, 0},
@@ -346,7 +349,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_HONG_KONG, FCC3_WORLD, "HK", 40, 160, 0},
 	{CTRY_HUNGARY, ETSI1_WORLD, "HU", 40, 160, 0},
 	{CTRY_ICELAND, ETSI1_WORLD, "IS", 40, 160, 0},
-	{CTRY_INDIA, APL15_WORLD, "IN", 40, 160, 0},
+	{CTRY_INDIA, APL19_ETSIC, "IN", 40, 160, 0},
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", 40, 20, 0},
 	{CTRY_IRAQ, ETSI1_WORLD, "IQ", 40, 160, 0},
 	{CTRY_IRELAND, ETSI1_WORLD, "IE", 40, 160, 0},
@@ -382,6 +385,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
 	{CTRY_MONTENEGRO, ETSI1_WORLD, "ME", 40, 160, 0},
 	{CTRY_MOROCCO, ETSI3_WORLD, "MA", 40, 160, 0},
+	{CTRY_MYANMAR, APL1_WORLD, "MM", 40, 160, 0},
 	{CTRY_NAMIBIA, APL20_WORLD, "NA", 40, 160, 0},
 	{CTRY_NEPAL, APL23_WORLD, "NP", 40, 160, 0},
 	{CTRY_NETHERLANDS, ETSI1_WORLD, "NL", 40, 160, 0},
@@ -415,7 +419,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD,
 	 "VC" , 40, 160, 0},
 	{CTRY_SAMOA, ETSI1_WORLD, "WS", 40, 40, 0},
-	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", 40, 160, 0},
+	{CTRY_SAUDI_ARABIA, ETSI15_WORLD, "SA", 40, 160, 0},
 	{CTRY_SENEGAL, FCC13_WORLD, "SN", 40, 160, 0},
 	{CTRY_SERBIA, ETSI1_WORLD, "RS", 40, 160, 0},
 	{CTRY_SINGAPORE, FCC3_WORLD, "SG", 40, 160, 0},
@@ -486,11 +490,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", 40, 160, 0},
 	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", 40, 40, 0},
 	{CTRY_CHAD, ETSI1_WORLD, "TD", 40, 160, 0},
-	{CTRY_CHILE, APL23_WORLD, "CL", 40, 160, 0},
+	{CTRY_CHILE, FCC13_WORLD, "CL", 40, 160, 0},
 	{CTRY_CHINA, APL14_WORLD, "CN", 40, 160, 0},
 	{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", 40, 160, 0},
 	{CTRY_COLOMBIA, FCC3_WORLD, "CO", 40, 160, 0},
-	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 20, 0},
+	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 160, 0},
 	{CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", 40, 160, 0},
 	{CTRY_CROATIA, ETSI10_WORLD, "HR", 40, 160, 0},
 	{CTRY_CYPRUS, ETSI10_WORLD, "CY", 40, 160, 0},
@@ -505,17 +509,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
 	{CTRY_FINLAND, ETSI10_WORLD, "FI", 40, 160, 0},
 	{CTRY_FRANCE, ETSI10_WORLD, "FR", 40, 160, 0},
-	{CTRY_FRENCH_GUIANA, ETSI13_WORLD, "GF", 40, 160, 0},
-	{CTRY_FRENCH_POLYNESIA, ETSI13_WORLD, "PF", 40, 160, 0},
+	{CTRY_FRENCH_GUIANA, ETSI10_WORLD, "GF", 40, 160, 0},
+	{CTRY_FRENCH_POLYNESIA, ETSI10_WORLD, "PF", 40, 160, 0},
 	{CTRY_GEORGIA, ETSI4_WORLD, "GE", 40, 160, 0},
 	{CTRY_GERMANY, ETSI10_WORLD, "DE", 40, 160, 0},
 	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
-	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", 40, 160, 0},
+	{CTRY_GIBRALTAR, ETSI10_WORLD, "GI", 40, 160, 0},
 	{CTRY_GREECE, ETSI10_WORLD, "GR", 40, 160, 0},
-	{CTRY_GREENLAND, ETSI1_WORLD, "GL", 40, 160, 0},
+	{CTRY_GREENLAND, ETSI10_WORLD, "GL", 40, 160, 0},
 	{CTRY_GRENADA, FCC3_FCCA, "GD", 40, 160, 0},
 	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", 40, 160, 0},
-	{CTRY_GUAM, FCC3_FCCA, "GU", 40, 160, 0},
+	{CTRY_GUAM, FCC10_FCCA, "GU", 40, 160, 0},
 	{CTRY_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
 	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
 	{CTRY_HAITI, FCC3_FCCA, "HT", 40, 160, 0},
@@ -548,24 +552,25 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MALDIVES, APL6_WORLD, "MV", 40, 160, 0},
 	{CTRY_MALTA, ETSI10_WORLD, "MT", 40, 160, 0},
 	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", 40, 160, 0},
-	{CTRY_MARTINIQUE, ETSI13_WORLD, "MQ", 40, 160, 0},
+	{CTRY_MARTINIQUE, ETSI10_WORLD, "MQ", 40, 160, 0},
 	{CTRY_MAURITANIA, ETSI1_WORLD, "MR", 40, 160, 0},
 	{CTRY_MAURITIUS, ETSI13_WORLD, "MU", 40, 160, 0},
 	{CTRY_MAYOTTE, ETSI1_WORLD, "YT", 40, 160, 0},
 	{CTRY_MEXICO, FCC3_ETSIC, "MX", 40, 160, 0},
 	{CTRY_MICRONESIA, FCC3_FCCA, "FM", 40, 160, 0},
 	{CTRY_MOLDOVA, ETSI13_WORLD, "MD", 40, 160, 0},
-	{CTRY_MONACO, ETSI13_WORLD, "MC", 40, 160, 0},
+	{CTRY_MONACO, ETSI10_WORLD, "MC", 40, 160, 0},
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
-	{CTRY_MONTENEGRO, ETSI13_WORLD, "ME", 40, 160, 0},
+	{CTRY_MONTENEGRO, ETSI10_WORLD, "ME", 40, 160, 0},
 	{CTRY_MOROCCO, ETSI3_WORLD, "MA", 40, 160, 0},
+	{CTRY_MYANMAR, APL1_WORLD, "MM", 40, 160, 0},
 	{CTRY_NAMIBIA, APL20_WORLD, "NA", 40, 160, 0},
 	{CTRY_NEPAL, APL23_WORLD, "NP", 40, 160, 0},
 	{CTRY_NETHERLANDS, ETSI10_WORLD, "NL", 40, 160, 0},
-	{CTRY_NETHERLANDS_ANTILLES, ETSI13_WORLD, "AN", 40, 160, 0},
+	{CTRY_NETHERLANDS_ANTILLES, ETSI10_WORLD, "AN", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", 40, 160, 0},
 	{CTRY_NIGERIA, APL8_WORLD, "NG", 40, 160, 0},
-	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", 40, 160, 0},
+	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, "MP", 40, 160, 0},
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
 	{CTRY_NORWAY, ETSI10_WORLD, "NO", 40, 160, 0},
 	{CTRY_OMAN, ETSI1_WORLD, "OM", 40, 160, 0},
@@ -578,7 +583,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_PHILIPPINES, FCC3_WORLD, "PH", 40, 160, 0},
 	{CTRY_POLAND, ETSI10_WORLD, "PL", 40, 160, 0},
 	{CTRY_PORTUGAL, ETSI10_WORLD, "PT", 40, 160, 0},
-	{CTRY_PUERTO_RICO, FCC3_FCCA, "PR", 40, 160, 0},
+	{CTRY_PUERTO_RICO, FCC10_FCCA, "PR", 40, 160, 0},
 	{CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0},
 	{CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0},
 	{CTRY_ROMANIA, ETSI10_WORLD, "RO", 40, 160, 0},
@@ -592,7 +597,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_WORLD, "VC",
 	 40, 160, 0},
 	{CTRY_SAMOA, ETSI1_WORLD, "WS", 40, 40, 0},
-	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", 40, 160, 0},
+	{CTRY_SAUDI_ARABIA, ETSI15_WORLD, "SA", 40, 160, 0},
 	{CTRY_SENEGAL, FCC13_WORLD, "SN", 40, 160, 0},
 	{CTRY_SERBIA, ETSI13_WORLD, "RS", 40, 160, 0},
 	{CTRY_SINGAPORE, FCC3_WORLD, "SG", 40, 160, 0},
@@ -622,7 +627,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_VANUATU, FCC3_WORLD, "VU", 40, 160, 0},
 	{CTRY_VENEZUELA, FCC2_ETSIC, "VE", 40, 160, 0},
 	{CTRY_VIET_NAM, FCC3_WORLD, "VN", 40, 80, 0},
-	{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", 40, 160, 0},
+	{CTRY_VIRGIN_ISLANDS, FCC10_FCCA, "VI", 40, 160, 0},
 	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", 40, 160, 0},
 	{CTRY_YEMEN, NULL1_WORLD, "YE", 40, 0, 0},
 	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", 40, 160, 0},
@@ -662,11 +667,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", 40, 160, 0},
 	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", 40, 40, 0},
 	{CTRY_CHAD, ETSI1_WORLD, "TD", 40, 160, 0},
-	{CTRY_CHILE, APL23_WORLD, "CL", 40, 160, 0},
+	{CTRY_CHILE, FCC13_WORLD, "CL", 40, 160, 0},
 	{CTRY_CHINA, APL14_WORLD, "CN", 40, 160, 0},
 	{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", 40, 160, 0},
 	{CTRY_COLOMBIA, FCC3_WORLD, "CO", 40, 160, 0},
-	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 20, 0},
+	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 160, 0},
 	{CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", 40, 160, 0},
 	{CTRY_CROATIA, ETSI13_WORLD, "HR", 40, 160, 0},
 	{CTRY_CYPRUS, ETSI13_WORLD, "CY", 40, 160, 0},
@@ -699,7 +704,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_HONG_KONG, FCC3_WORLD, "HK", 40, 160, 0},
 	{CTRY_HUNGARY, ETSI13_WORLD, "HU", 40, 160, 0},
 	{CTRY_ICELAND, ETSI13_WORLD, "IS", 40, 160, 0},
-	{CTRY_INDIA, APL15_WORLD, "IN", 40, 160, 0},
+	{CTRY_INDIA, APL19_ETSIC, "IN", 40, 160, 0},
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", 40, 20, 0},
 	{CTRY_IRAQ, ETSI1_WORLD, "IQ", 40, 160, 0},
 	{CTRY_IRELAND, ETSI13_WORLD, "IE", 40, 160, 0},
@@ -735,6 +740,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
 	{CTRY_MONTENEGRO, ETSI13_WORLD, "ME", 40, 160, 0},
 	{CTRY_MOROCCO, ETSI3_WORLD, "MA", 40, 160, 0},
+	{CTRY_MYANMAR, APL1_WORLD, "MM", 40, 160, 0},
 	{CTRY_NAMIBIA, APL20_WORLD, "NA", 40, 160, 0},
 	{CTRY_NEPAL, APL23_WORLD, "NP", 40, 160, 0},
 	{CTRY_NETHERLANDS, ETSI13_WORLD, "NL", 40, 160, 0},
@@ -768,7 +774,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_WORLD, "VC",
 	 40, 160, 0},
 	{CTRY_SAMOA, ETSI1_WORLD, "WS", 40, 40, 0},
-	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", 40, 160, 0},
+	{CTRY_SAUDI_ARABIA, ETSI15_WORLD, "SA", 40, 160, 0},
 	{CTRY_SENEGAL, FCC13_WORLD, "SN", 40, 160, 0},
 	{CTRY_SERBIA, ETSI13_WORLD, "RS", 40, 160, 0},
 	{CTRY_SINGAPORE, FCC3_WORLD, "SG", 40, 160, 0},
@@ -792,7 +798,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, 0},
 	{CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0},
 	{CTRY_UNITED_KINGDOM, ETSI13_WORLD, "GB", 40, 160, 0},
-	{CTRY_UNITED_STATES, FCC8_FCCA, "US", 40, 160, 0},
+	{CTRY_UNITED_STATES, FCC3_FCCA, "US", 40, 160, 0},
 	{CTRY_URUGUAY, FCC2_WORLD, "UY", 40, 160, 0},
 	{CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", 40, 160, 0},
 	{CTRY_VANUATU, FCC3_WORLD, "VU", 40, 160, 0},
@@ -844,6 +850,7 @@ enum reg_domains_5g {
 	ETSI12,
 	ETSI13,
 	ETSI14,
+	ETSI15,
 	APL1,
 	APL2,
 	APL4,
@@ -898,10 +905,13 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{ETSI4_WORLD, ETSI4, WORLD},
 	{ETSI8_WORLD, ETSI8, WORLD},
 	{ETSI9_WORLD, ETSI9, WORLD},
+	{ETSI10_WORLD, ETSI10, WORLD},
+	{ETSI10_FCCA, ETSI10, FCCA},
 	{ETSI11_WORLD, ETSI11, WORLD},
 	{ETSI12_WORLD, ETSI12, WORLD},
 	{ETSI13_WORLD, ETSI13, WORLD},
 	{ETSI14_WORLD, ETSI14, WORLD},
+	{ETSI15_WORLD, ETSI15, WORLD},
 
 	{APL1_WORLD, APL1, WORLD},
 	{APL1_ETSIC, APL1, ETSIC},
@@ -981,7 +991,7 @@ const struct regdomain regdomains_2g[] = {
 	[FCCB] = {CTL_FCC, DFS_UNINIT_REGION, 0, 6, 1, {CHAN_1_11_3} },
 	[WORLD] = {CTL_ETSI, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_1} },
 	[MKKA] = {CTL_MKK, DFS_UNINIT_REGION, 0, 0, 2, {CHAN_1_13_4,
-			   CHAN_14_1} },
+							CHAN_14_1} },
 	[MKKC] = {CTL_MKK, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_4} },
 	[ETSIC] = {CTL_ETSI, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_2} },
 	[ETSID] = {CTL_ETSI, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_3} },
@@ -1148,190 +1158,198 @@ const struct regulatory_rule reg_rules_5g[] = {
 const struct regdomain regdomains_5g[] = {
 
 	[FCC1] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 3, {CHAN_5170_5250_1,
-					      CHAN_5250_5330_1,
-					      CHAN_5735_5835_2} },
+						     CHAN_5250_5330_1,
+						     CHAN_5735_5835_2} },
 
 	[FCC2] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 3, {CHAN_5170_5250_2,
-					     CHAN_5250_5330_1,
-					     CHAN_5735_5835_2} },
+						     CHAN_5250_5330_1,
+						     CHAN_5735_5835_2} },
 
 	[FCC3] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_5,
-					      CHAN_5250_5330_7,
-					      CHAN_5490_5730_1,
-					      CHAN_5735_5835_2} },
+						     CHAN_5250_5330_7,
+						     CHAN_5490_5730_1,
+						     CHAN_5735_5835_2} },
 
 	[FCC4] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 1, {CHAN_4940_4990_1} },
 
 	[FCC5] = {CTL_FCC, DFS_UNINIT_REGION, 2, 6, 2, {CHAN_5170_5250_4,
-					      CHAN_5735_5835_2} },
+							CHAN_5735_5835_2} },
 
 	[FCC6] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 5, {CHAN_5170_5250_5,
-					      CHAN_5250_5330_7,
-					      CHAN_5490_5590_1,
-					      CHAN_5650_5730_1,
-					      CHAN_5735_5835_2} },
+						     CHAN_5250_5330_7,
+						     CHAN_5490_5590_1,
+						     CHAN_5650_5730_1,
+						     CHAN_5735_5835_2} },
 
 	[FCC8] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_4,
-					      CHAN_5250_5330_7,
-					      CHAN_5490_5730_1,
-					      CHAN_5735_5835_2} },
+						     CHAN_5250_5330_7,
+						     CHAN_5490_5730_1,
+						     CHAN_5735_5835_2} },
 
 	[FCC10] = {CTL_FCC, DFS_FCC_REGION, 2, 0, 5, {CHAN_5170_5250_4,
-						   CHAN_5250_5330_7,
-						   CHAN_5490_5730_1,
-						   CHAN_5735_5835_2,
-						   CHAN_5850_5925_1} },
+						      CHAN_5250_5330_7,
+						      CHAN_5490_5730_1,
+						      CHAN_5735_5835_2,
+						      CHAN_5850_5925_1} },
 
 	[FCC11] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_5,
-					      CHAN_5250_5330_7,
-					      CHAN_5490_5650_2,
-					      CHAN_5735_5835_6} },
+						      CHAN_5250_5330_7,
+						      CHAN_5490_5650_2,
+						      CHAN_5735_5835_6} },
 
 	[FCC13] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 4, {CHAN_5170_5330_2,
-					      CHAN_5250_5330_10,
-					      CHAN_5490_5730_4,
-					      CHAN_5735_5835_2} },
+							 CHAN_5250_5330_10,
+							 CHAN_5490_5730_4,
+							 CHAN_5735_5835_2} },
 
 	[FCC14] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 4, {CHAN_5170_5250_4,
-					      CHAN_5250_5330_10,
-					      CHAN_5490_5730_4,
-					      CHAN_5735_5835_2} },
+							 CHAN_5250_5330_10,
+							 CHAN_5490_5730_4,
+							 CHAN_5735_5835_2} },
 
 	[ETSI1] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-						 CHAN_5250_5330_1,
-						 CHAN_5490_5710_1} },
+							CHAN_5250_5330_1,
+							CHAN_5490_5710_1} },
 
 	[ETSI3] = {CTL_ETSI, DFS_ETSI_REGION, 5, 0, 2, {CHAN_5170_5250_2,
-						 CHAN_5250_5330_1} },
+							CHAN_5250_5330_1} },
 
 	[ETSI4] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 2, {CHAN_5170_5250_6,
-						 CHAN_5250_5330_3} },
+							CHAN_5250_5330_3} },
 
 	[ETSI8] = {CTL_ETSI, DFS_UNINIT_REGION, 20, 0, 4, {CHAN_5170_5250_2,
-						  CHAN_5250_5330_5,
-						  CHAN_5490_5730_3,
-						  CHAN_5735_5835_2} },
+							   CHAN_5250_5330_5,
+							   CHAN_5490_5730_3,
+							   CHAN_5735_5835_2} },
 
 	[ETSI9] = {CTL_ETSI, DFS_ETSI_REGION, 20, 0, 4, {CHAN_5170_5250_2,
-						  CHAN_5250_5330_1,
-						  CHAN_5490_5710_5,
-						  CHAN_5735_5835_6} },
+							 CHAN_5250_5330_1,
+							 CHAN_5490_5710_5,
+							 CHAN_5735_5835_6} },
 
 	[ETSI10] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_3,
-						       CHAN_5250_5330_2,
-						       CHAN_5490_5710_3,
-						       CHAN_5850_5925_2} },
+							  CHAN_5250_5330_2,
+							  CHAN_5490_5710_3,
+							  CHAN_5850_5925_2} },
 
 	[ETSI11] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_3,
-						       CHAN_5250_5330_2,
-						       CHAN_5490_5710_3,
-						       CHAN_5735_5875_1} },
+							  CHAN_5250_5330_2,
+							  CHAN_5490_5710_3,
+							  CHAN_5735_5875_1} },
 
 	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_3,
-						  CHAN_5250_5330_2,
-						  CHAN_5490_5730_6,
-						  CHAN_5735_5835_8} },
+							 CHAN_5250_5330_2,
+							 CHAN_5490_5730_6,
+							 CHAN_5735_5835_8} },
 
 	[ETSI13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_2,
-						  CHAN_5250_5330_1,
-						  CHAN_5490_5730_5,
-						  CHAN_5735_5875_4} },
+							 CHAN_5250_5330_1,
+							 CHAN_5490_5730_5,
+							 CHAN_5735_5875_4} },
 
 	[ETSI14] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_2,
-						  CHAN_5250_5330_1,
-						  CHAN_5490_5730_7,
-						  CHAN_5735_5875_5} },
+							 CHAN_5250_5330_1,
+							 CHAN_5490_5730_7,
+							 CHAN_5735_5875_5} },
+
+	[ETSI15] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_2,
+							 CHAN_5250_5330_1,
+							 CHAN_5490_5710_1,
+							 CHAN_5735_5835_2} },
 
 	[APL1] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5735_5835_2} },
 
 	[APL2] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5735_5815_1} },
 
 	[APL4] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 2, {CHAN_5170_5250_2,
-						  CHAN_5735_5835_1} },
+							 CHAN_5735_5835_1} },
 
 	[APL6] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_3,
-						CHAN_5250_5330_2,
-						CHAN_5735_5835_3} },
+						       CHAN_5250_5330_2,
+						       CHAN_5735_5835_3} },
 
-	[APL8] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 2, {CHAN_5250_5330_4,
-						CHAN_5735_5835_2} },
+	[APL8] = {CTL_FCC, DFS_ETSI_REGION, 2, 0, 2, {CHAN_5250_5330_4,
+						      CHAN_5735_5835_2} },
 
 	[APL9] = {CTL_ETSI, DFS_KR_REGION, 2, 6, 4, {CHAN_5170_5250_3,
-					      CHAN_5250_5330_1,
-					      CHAN_5490_5710_1,
-					      CHAN_5735_5835_2} },
+						     CHAN_5250_5330_1,
+						     CHAN_5490_5710_1,
+						     CHAN_5735_5835_2} },
 
 	[APL10] = {CTL_ETSI, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_2,
-						 CHAN_5250_5330_4,
-						 CHAN_5490_5710_1,
-						 CHAN_5735_5815_1} },
+						       CHAN_5250_5330_4,
+						       CHAN_5490_5710_1,
+						       CHAN_5735_5815_1} },
 
 	[APL11] = { CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_9,
-						 CHAN_5250_5330_13,
-						 CHAN_5490_5710_4,
-						 CHAN_5735_5875_2} },
+							 CHAN_5250_5330_13,
+							 CHAN_5490_5710_4,
+							 CHAN_5735_5875_2} },
 
 	[APL12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-						 CHAN_5490_5570_1,
-						 CHAN_5735_5775_1} },
+							CHAN_5490_5570_1,
+							CHAN_5735_5775_1} },
 
 	[APL13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-						 CHAN_5250_5330_1,
-						 CHAN_5490_5670_2} },
+							CHAN_5250_5330_1,
+							CHAN_5490_5670_2} },
 
 	[APL14] = {CTL_FCC, DFS_CN_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-					      CHAN_5250_5330_1,
-					      CHAN_5735_5835_4} },
+						     CHAN_5250_5330_1,
+						     CHAN_5735_5835_4} },
 
 	[APL15] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-					      CHAN_5250_5330_5,
-					      CHAN_5735_5835_4} },
+							 CHAN_5250_5330_5,
+							 CHAN_5735_5835_4} },
 
 	[APL16] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 5, {CHAN_5170_5250_1,
-					    CHAN_5250_5330_6,
-					    CHAN_5490_5590_2,
-					    CHAN_5650_5730_2,
-					    CHAN_5735_5835_2} },
+							 CHAN_5250_5330_6,
+							 CHAN_5490_5590_2,
+							 CHAN_5650_5730_2,
+							 CHAN_5735_5835_2} },
 
 	[APL17] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 5, {CHAN_5170_5250_2,
-					    CHAN_5250_5330_8,
-					    CHAN_5490_5590_3,
-					    CHAN_5650_5730_3,
-					    CHAN_5735_5835_7} },
+							 CHAN_5250_5330_8,
+							 CHAN_5490_5590_3,
+							 CHAN_5650_5730_3,
+							 CHAN_5735_5835_7} },
 
-	[APL19] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-					    CHAN_5250_5330_5,
-					    CHAN_5735_5875_3} },
+	[APL19] = {CTL_FCC, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_4,
+						       CHAN_5250_5330_7,
+						       CHAN_5490_5730_1,
+						       CHAN_5735_5875_3} },
 
 	[APL20] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_8,
-					     CHAN_5250_5330_12,
-					     CHAN_5490_5730_5,
-					     CHAN_5735_5835_4} },
+							CHAN_5250_5330_12,
+							CHAN_5490_5730_5,
+							CHAN_5735_5835_4} },
 
 	[APL23] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_7,
-					     CHAN_5250_5330_11,
-					     CHAN_5735_5835_3} },
+							  CHAN_5250_5330_11,
+							  CHAN_5735_5835_3} },
 
 	[MKK3] = {CTL_MKK, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5170_5250_3} },
 
 	[MKK5] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-					      CHAN_5250_5330_1,
-					      CHAN_5490_5710_7} },
+						     CHAN_5250_5330_1,
+						     CHAN_5490_5710_7} },
 
 	[MKK11] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 5, {CHAN_4910_4990_1,
-					       CHAN_5170_5250_2,
-					       CHAN_5030_5090_1,
-					       CHAN_5250_5330_1,
-					       CHAN_5490_5710_7} },
+						      CHAN_5170_5250_2,
+						      CHAN_5030_5090_1,
+						      CHAN_5250_5330_1,
+						      CHAN_5490_5710_7} },
 
 	[MKK16] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 1, {CHAN_5490_5710_6} },
 
-	[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 2, {CHAN_5170_5330_1,
-						       CHAN_5735_5835_5} },
+	[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 2,
+			{CHAN_5170_5330_1,
+			 CHAN_5735_5835_5} },
 
-	[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5330_1,
-						       CHAN_5490_5730_2,
-						       CHAN_5735_5835_5} },
+	[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 3,
+			{CHAN_5170_5330_1,
+			 CHAN_5490_5730_2,
+			 CHAN_5735_5835_5} },
 };
 
 QDF_STATUS reg_get_num_countries(int *num_countries)