qcacmn: Update regdb with regulatory database version 29

Update regdb with QCA regulatory database version 29 with following
changes:

1) Create new full RD Def: APL9_MKKC and change Korea Country mapping to
APL9_MKKC.
2) Change APL9 to CTL Region MKK.
3) Change APL9 power to 23 for all 5GHz subbands.
4) Create new 2GHz RD Def: KRRA and Full RD Def: APL9_KRRA.
5) Create new MKK17_MKKC for Japan: Same as MKK5 but with added
channel 144 (Japan country code remains mapped to MKK5_MKKC for now).
6) Change Japan MKK5 lower bands to "indoor".
7) Change Canada in LA country table to FCC6_FCCA.
8) Change Georgia to ETSI1_World.
9) Change Dominican Republic to FCC3_FCCA.
10) Change Kenya to ETSI13_WORLD.
11) Change Kazakhstan to MKK5_MKKC.
12) New Countries added Aland Islands, Andorra, Antigua and Barbuda,
    Cameroon, Cook Islands, Falkland Islands, Faroe Islands, French
    Southern Territories, Georgia, Guernsey, Heard Island, Holy See, Isle
    of Man, Jersey, Montserrat, New Caledonia, Niue, Norfolk Island, Saint
    Helena, San Marino, Sao Tome, Sint Maarten, Svalbard, United States
    Minor Outlying Islands and Virgin Islands (British).

Change-Id: Ic64ac96fa3e0828f628fecced66297ce176b3d3a
CRs-Fixed: 2475613 2454185

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 27.
+ * Current implementation conforms to database version 29.
  */
 
 #include <qdf_types.h>
@@ -31,10 +31,13 @@
 
 enum country_code {
 	CTRY_AFGHANISTAN = 4,
+	CTRY_ALAND_ISLANDS = 248,
 	CTRY_ALBANIA = 8,
 	CTRY_ALGERIA = 12,
 	CTRY_AMERICAN_SAMOA = 16,
+	CTRY_ANDORRA = 20,
 	CTRY_ANGUILLA = 660,
+	CTRY_ANTIGUA_AND_BARBUDA = 28,
 	CTRY_ARGENTINA = 32,
 	CTRY_ARMENIA = 51,
 	CTRY_MYANMAR = 104,
@@ -58,6 +61,7 @@ enum country_code {
 	CTRY_BULGARIA = 100,
 	CTRY_BURKINA_FASO = 854,
 	CTRY_CAMBODIA = 116,
+	CTRY_CAMEROON = 120,
 	CTRY_CANADA = 124,
 	CTRY_CAYMAN_ISLANDS = 136,
 	CTRY_CENTRAL_AFRICA_REPUBLIC = 140,
@@ -66,6 +70,7 @@ enum country_code {
 	CTRY_CHINA = 156,
 	CTRY_CHRISTMAS_ISLAND = 162,
 	CTRY_COLOMBIA = 170,
+	CTRY_COOK_ISLANDS = 184,
 	CTRY_COSTA_RICA = 188,
 	CTRY_COTE_DIVOIRE = 384,
 	CTRY_CROATIA = 191,
@@ -79,10 +84,13 @@ enum country_code {
 	CTRY_EL_SALVADOR = 222,
 	CTRY_ESTONIA = 233,
 	CTRY_ETHIOPIA = 231,
+	CTRY_FALKLAND_ISLANDS = 238,
+	CTRY_FAROE_ISLANDS = 234,
 	CTRY_FINLAND = 246,
 	CTRY_FRANCE = 250,
 	CTRY_FRENCH_GUIANA = 254,
 	CTRY_FRENCH_POLYNESIA = 258,
+	CTRY_FRENCH_SOUTHERN_TERRITORIES = 260,
 	CTRY_GEORGIA = 268,
 	CTRY_GERMANY = 276,
 	CTRY_GHANA = 288,
@@ -93,8 +101,11 @@ enum country_code {
 	CTRY_GUADELOUPE = 312,
 	CTRY_GUAM = 316,
 	CTRY_GUATEMALA = 320,
+	CTRY_GUERNSEY = 831,
 	CTRY_GUYANA = 328,
 	CTRY_HAITI = 332,
+	CTRY_HEARD_ISLAND_AND_MCDONALD_ISLANDS = 334,
+	CTRY_HOLY_SEE = 336,
 	CTRY_HONDURAS = 340,
 	CTRY_HONG_KONG = 344,
 	CTRY_HUNGARY = 348,
@@ -103,9 +114,11 @@ enum country_code {
 	CTRY_INDONESIA = 360,
 	CTRY_IRAQ = 368,
 	CTRY_IRELAND = 372,
+	CTRY_ISLE_OF_MAN = 833,
 	CTRY_ISRAEL = 376,
 	CTRY_ITALY = 380,
 	CTRY_JAMAICA = 388,
+	CTRY_JERSEY = 832,
 	CTRY_JORDAN = 400,
 	CTRY_KAZAKHSTAN = 398,
 	CTRY_KENYA = 404,
@@ -134,15 +147,19 @@ enum country_code {
 	CTRY_MONACO = 492,
 	CTRY_MONGOLIA = 496,
 	CTRY_MONTENEGRO = 499,
+	CTRY_MONTSERRAT = 500,
 	CTRY_MOROCCO = 504,
 	CTRY_NAMIBIA = 516,
 	CTRY_NEPAL = 524,
 	CTRY_NETHERLANDS = 528,
 	CTRY_NETHERLANDS_ANTILLES = 530,
+	CTRY_NEW_CALEDONIA = 540,
 	CTRY_NEW_ZEALAND = 554,
 	CTRY_NIGERIA = 566,
 	CTRY_NORTHERN_MARIANA_ISLANDS = 580,
 	CTRY_NICARAGUA = 558,
+	CTRY_NIUE = 570,
+	CTRY_NORFOLK_ISLAND = 574,
 	CTRY_NORWAY = 578,
 	CTRY_OMAN = 512,
 	CTRY_PAKISTAN = 586,
@@ -161,22 +178,27 @@ enum country_code {
 	CTRY_RUSSIA = 643,
 	CTRY_RWANDA = 646,
 	CTRY_SAINT_BARTHELEMY = 652,
+	CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA = 654,
 	CTRY_SAINT_KITTS_AND_NEVIS = 659,
 	CTRY_SAINT_LUCIA = 662,
 	CTRY_SAINT_MARTIN = 663,
 	CTRY_SAINT_PIERRE_AND_MIQUELON = 666,
 	CTRY_SAINT_VINCENT_AND_THE_GRENADIENS = 670,
 	CTRY_SAMOA = 882,
+	CTRY_SAN_MARINO = 674,
+	CTRY_SAO_TOME_AND_PRINCIPE = 678,
 	CTRY_SAUDI_ARABIA = 682,
 	CTRY_SENEGAL = 686,
 	CTRY_SERBIA = 688,
 	CTRY_SINGAPORE = 702,
+	CTRY_SINT_MAARTEN = 534,
 	CTRY_SLOVAKIA = 703,
 	CTRY_SLOVENIA = 705,
 	CTRY_SOUTH_AFRICA = 710,
 	CTRY_SPAIN = 724,
 	CTRY_SURINAME = 740,
 	CTRY_SRI_LANKA = 144,
+	CTRY_SVALBARD_AND_JAN_MAYEN = 744,
 	CTRY_SWEDEN = 752,
 	CTRY_SWITZERLAND = 756,
 	CTRY_TAIWAN = 158,
@@ -192,12 +214,14 @@ enum country_code {
 	CTRY_UAE = 784,
 	CTRY_UNITED_KINGDOM = 826,
 	CTRY_UNITED_STATES = 840,
+	CTRY_UNITED_STATES_MINOR_OUTLYING_ISLANDS = 581,
 	CTRY_URUGUAY = 858,
 	CTRY_UZBEKISTAN = 860,
 	CTRY_VANUATU = 548,
 	CTRY_VENEZUELA = 862,
 	CTRY_VIET_NAM = 704,
 	CTRY_VIRGIN_ISLANDS = 850,
+	CTRY_VIRGIN_ISLANDS_BRITISH = 92,
 	CTRY_WALLIS_AND_FUTUNA = 876,
 	CTRY_YEMEN = 887,
 	CTRY_ZIMBABWE = 716,
@@ -249,6 +273,8 @@ enum reg_domain {
 	APL6_WORLD = 0x5B,
 	APL8_WORLD = 0x5D,
 	APL9_WORLD = 0x5E,
+	APL9_MKKC  = 0x48,
+	APL9_KRRA  = 0x43,
 	APL10_WORLD = 0x5F,
 	APL11_FCCA = 0x4F,
 	APL12_WORLD = 0x51,
@@ -266,6 +292,7 @@ enum reg_domain {
 	MKK5_MKKC = 0x88,
 	MKK11_MKKC = 0xD7,
 	MKK16_MKKC = 0xDF,
+	MKK17_MKKC = 0xE1,
 
 	WORLD_60 = 0x60,
 	WORLD_61 = 0x61,
@@ -284,10 +311,13 @@ enum reg_domain {
 #ifndef CONFIG_REG_CLIENT
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 40, 160, 0},
+	{CTRY_ALAND_ISLANDS, FCC3_WORLD, "AX", 40, 160, 0},
 	{CTRY_ALBANIA, ETSI1_WORLD, "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
+	{CTRY_ANDORRA, ETSI3_WORLD, "AD", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
+	{CTRY_ANTIGUA_AND_BARBUDA, ETSI1_WORLD, "AG", 40, 160, 0},
 	{CTRY_ARGENTINA, APL16_WORLD, "AR", 40, 160, 0},
 	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
 	{CTRY_ARUBA, ETSI1_WORLD, "AW", 40, 160, 0},
@@ -310,6 +340,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_BULGARIA, ETSI1_WORLD, "BG", 40, 160, 0},
 	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", 40, 160, 0},
 	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", 40, 160, 0},
+	{CTRY_CAMEROON, ETSI1_WORLD, "CM", 40, 160, 0},
 	{CTRY_CANADA, FCC6_FCCA, "CA", 40, 160, 0},
 	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", 40, 160, 0},
 	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", 40, 40, 0},
@@ -318,6 +349,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_COOK_ISLANDS, FCC3_WORLD, "CK", 40, 160, 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},
@@ -325,17 +357,20 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_CZECH, ETSI1_WORLD, "CZ", 40, 160, 0},
 	{CTRY_DENMARK, ETSI1_WORLD, "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC1_FCCA, "DM", 40, 160, 0},
-	{CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", 40, 160, 0},
+	{CTRY_DOMINICAN_REPUBLIC, FCC3_FCCA, "DO", 40, 160, 0},
 	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
 	{CTRY_EL_SALVADOR, FCC1_WORLD, "SV", 40, 20, 0},
 	{CTRY_ESTONIA, ETSI1_WORLD, "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
+	{CTRY_FALKLAND_ISLANDS, ETSI1_WORLD, "FK", 40, 160, 0},
+	{CTRY_FAROE_ISLANDS, ETSI1_WORLD, "FO", 40, 160, 0},
 	{CTRY_FINLAND, ETSI1_WORLD, "FI", 40, 160, 0},
 	{CTRY_FRANCE, ETSI1_WORLD, "FR", 40, 160, 0},
 	{CTRY_FRENCH_GUIANA, ETSI1_WORLD, "GF", 40, 160, 0},
 	{CTRY_FRENCH_POLYNESIA, ETSI1_WORLD, "PF", 40, 160, 0},
-	{CTRY_GEORGIA, ETSI4_WORLD, "GE", 40, 160, 0},
+	{CTRY_FRENCH_SOUTHERN_TERRITORIES, ETSI1_WORLD, "TF", 40, 160, 0},
+	{CTRY_GEORGIA, ETSI1_WORLD, "GE", 40, 160, 0},
 	{CTRY_GERMANY, ETSI1_WORLD, "DE", 40, 160, 0},
 	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
 	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", 40, 160, 0},
@@ -345,8 +380,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", 40, 160, 0},
 	{CTRY_GUAM, FCC3_FCCA, "GU", 40, 160, 0},
 	{CTRY_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
+	{CTRY_GUERNSEY, ETSI1_WORLD, "GG", 40, 160, 0},
 	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
 	{CTRY_HAITI, FCC3_FCCA, "HT", 40, 160, 0},
+	{CTRY_HEARD_ISLAND_AND_MCDONALD_ISLANDS, FCC6_WORLD, "HM", 40, 160, 0},
+	{CTRY_HOLY_SEE, ETSI1_WORLD, "VA", 40, 160, 0},
 	{CTRY_HONDURAS, FCC3_WORLD, "HN", 40, 160, 0},
 	{CTRY_HONG_KONG, FCC3_WORLD, "HK", 40, 160, 0},
 	{CTRY_HUNGARY, ETSI1_WORLD, "HU", 40, 160, 0},
@@ -355,13 +393,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", 40, 20, 0},
 	{CTRY_IRAQ, ETSI1_WORLD, "IQ", 40, 160, 0},
 	{CTRY_IRELAND, ETSI1_WORLD, "IE", 40, 160, 0},
+	{CTRY_ISLE_OF_MAN, ETSI1_WORLD, "IM", 40, 160, 0},
 	{CTRY_ISRAEL, ETSI3_WORLD, "IL", 40, 160, 0},
 	{CTRY_ITALY, ETSI1_WORLD, "IT", 40, 160,  0},
 	{CTRY_JAMAICA, FCC13_WORLD, "JM", 40, 160, 0},
+	{CTRY_JERSEY, ETSI1_WORLD, "JE", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
-	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", 40, 0, 0},
-	{CTRY_KENYA, APL12_WORLD, "KE", 40, 160, 0},
-	{CTRY_KOREA_ROC, APL9_WORLD, "KR", 40, 160, 0},
+	{CTRY_KAZAKHSTAN, MKK5_MKKC, "KZ", 40, 160, 0},
+	{CTRY_KENYA, ETSI13_WORLD, "KE", 40, 160, 0},
+	{CTRY_KOREA_ROC, APL9_MKKC, "KR", 40, 160, 0},
 	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
 	{CTRY_LATVIA, ETSI1_WORLD, "LV", 40, 160, 0},
 	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
@@ -386,16 +426,20 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MONACO, ETSI1_WORLD, "MC", 40, 160, 0},
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
 	{CTRY_MONTENEGRO, ETSI1_WORLD, "ME", 40, 160, 0},
+	{CTRY_MONTSERRAT, ETSI1_WORLD, "MS", 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},
 	{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", 40, 160, 0},
+	{CTRY_NEW_CALEDONIA, ETSI1_WORLD, "NC", 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_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
+	{CTRY_NIUE, ETSI1_WORLD, "NU", 40, 160, 0},
+	{CTRY_NORFOLK_ISLAND, FCC6_WORLD, "NF", 40, 160, 0},
 	{CTRY_NORWAY, ETSI1_WORLD, "NO", 40, 160, 0},
 	{CTRY_OMAN, ETSI1_WORLD, "OM", 40, 160, 0},
 	{CTRY_PAKISTAN, APL1_ETSIC, "PK", 40, 160, 0},
@@ -414,6 +458,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0},
 	{CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0},
 	{CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0},
+	{CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI1_WORLD, "SH",
+	 40, 160, 0},
 	{CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", 40, 160, 0},
 	{CTRY_SAINT_LUCIA, APL10_WORLD, "LC", 40, 160, 0},
 	{CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", 40, 160, 0},
@@ -421,16 +467,20 @@ 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_SAN_MARINO, FCC3_FCCA, "SM", 40, 160, 0},
+	{CTRY_SAO_TOME_AND_PRINCIPE, FCC3_WORLD, "ST", 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},
+	{CTRY_SINT_MAARTEN, ETSI1_WORLD, "SX", 40, 160, 0},
 	{CTRY_SLOVAKIA, ETSI1_WORLD, "SK", 40, 160, 0},
 	{CTRY_SLOVENIA, ETSI1_WORLD, "SI", 40, 160, 0},
 	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", 40, 160, 0},
 	{CTRY_SPAIN, ETSI1_WORLD, "ES", 40, 160, 0},
 	{CTRY_SURINAME, ETSI1_WORLD, "SR", 40, 160, 0},
 	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", 40, 20, 0},
+	{CTRY_SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, "SJ", 40, 160, 0},
 	{CTRY_SWEDEN, ETSI1_WORLD, "SE", 40, 160, 0},
 	{CTRY_SWITZERLAND, ETSI1_WORLD, "CH", 40, 160, 0},
 	{CTRY_TAIWAN, FCC3_FCCA, "TW", 40, 160, 0},
@@ -446,12 +496,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0},
 	{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", 40, 160, 0},
 	{CTRY_UNITED_STATES, FCC8_FCCA, "US", 40, 160, 0},
+	{CTRY_UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC8_FCCA, "UM", 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},
 	{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_BRITISH, ETSI1_WORLD, "VG", 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},
@@ -462,10 +515,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 #ifdef WLAN_FEATURE_DSRC
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 40, 160, 0},
+	{CTRY_ALAND_ISLANDS, FCC3_WORLD, "AX", 40, 160, 0},
 	{CTRY_ALBANIA, ETSI13_WORLD, "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
+	{CTRY_ANDORRA, ETSI3_WORLD, "AD", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
+	{CTRY_ANTIGUA_AND_BARBUDA, ETSI10_WORLD, "AG", 40, 160, 0},
 	{CTRY_ARGENTINA, APL17_ETSID, "AR", 40, 160, 0},
 	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
 	{CTRY_ARUBA, ETSI1_WORLD, "AW", 40, 160, 0},
@@ -488,6 +544,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_BULGARIA, ETSI10_WORLD, "BG", 40, 160, 0},
 	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", 40, 160, 0},
 	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", 40, 160, 0},
+	{CTRY_CAMEROON, ETSI1_WORLD, "CM", 40, 160, 0},
 	{CTRY_CANADA, FCC3_FCCA, "CA", 40, 160, 0},
 	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", 40, 160, 0},
 	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", 40, 40, 0},
@@ -496,6 +553,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_COOK_ISLANDS, FCC3_WORLD, "CK", 40, 160, 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},
@@ -503,17 +561,20 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_CZECH, ETSI10_WORLD, "CZ", 40, 160, 0},
 	{CTRY_DENMARK, ETSI10_WORLD, "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC2_FCCA, "DM", 40, 160, 0},
-	{CTRY_DOMINICAN_REPUBLIC, FCC2_FCCA, "DO", 40, 160, 0},
+	{CTRY_DOMINICAN_REPUBLIC, FCC3_FCCA, "DO", 40, 160, 0},
 	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
 	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", 40, 20, 0},
 	{CTRY_ESTONIA, ETSI10_WORLD, "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
+	{CTRY_FALKLAND_ISLANDS, ETSI10_WORLD, "FK", 40, 160, 0},
+	{CTRY_FAROE_ISLANDS, ETSI10_WORLD, "FO", 40, 160, 0},
 	{CTRY_FINLAND, ETSI10_WORLD, "FI", 40, 160, 0},
 	{CTRY_FRANCE, ETSI10_WORLD, "FR", 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_FRENCH_SOUTHERN_TERRITORIES, ETSI10_WORLD, "TF", 40, 160, 0},
+	{CTRY_GEORGIA, ETSI1_WORLD, "GE", 40, 160, 0},
 	{CTRY_GERMANY, ETSI10_WORLD, "DE", 40, 160, 0},
 	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
 	{CTRY_GIBRALTAR, ETSI10_WORLD, "GI", 40, 160, 0},
@@ -523,8 +584,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", 40, 160, 0},
 	{CTRY_GUAM, FCC10_FCCA, "GU", 40, 160, 0},
 	{CTRY_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
+	{CTRY_GUERNSEY, ETSI10_WORLD, "GG", 40, 160, 0},
 	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
 	{CTRY_HAITI, FCC3_FCCA, "HT", 40, 160, 0},
+	{CTRY_HEARD_ISLAND_AND_MCDONALD_ISLANDS, FCC6_WORLD, "HM", 40, 160, 0},
+	{CTRY_HOLY_SEE, ETSI10_WORLD, "VA", 40, 160, 0},
 	{CTRY_HONDURAS, FCC13_WORLD, "HN", 40, 160, 0},
 	{CTRY_HONG_KONG, FCC3_WORLD, "HK", 40, 160, 0},
 	{CTRY_HUNGARY, ETSI10_WORLD, "HU", 40, 160, 0},
@@ -533,13 +597,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", 40, 20, 0},
 	{CTRY_IRAQ, ETSI1_WORLD, "IQ", 40, 160, 0},
 	{CTRY_IRELAND, ETSI10_WORLD, "IE", 40, 160, 0},
+	{CTRY_ISLE_OF_MAN, ETSI10_WORLD, "IM", 40, 160, 0},
 	{CTRY_ISRAEL, ETSI3_WORLD, "IL", 40, 160, 0},
 	{CTRY_ITALY, ETSI10_WORLD, "IT", 40, 160,  0},
 	{CTRY_JAMAICA, FCC13_WORLD, "JM", 40, 160, 0},
+	{CTRY_JERSEY, ETSI10_WORLD, "JE", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
-	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", 40, 0, 0},
-	{CTRY_KENYA, APL12_WORLD, "KE", 40, 160, 0},
-	{CTRY_KOREA_ROC, APL9_WORLD, "KR", 40, 160, 0},
+	{CTRY_KAZAKHSTAN, MKK5_MKKC, "KZ", 40, 160, 0},
+	{CTRY_KENYA, ETSI13_WORLD, "KE", 40, 160, 0},
+	{CTRY_KOREA_ROC, APL9_MKKC, "KR", 40, 160, 0},
 	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
 	{CTRY_LATVIA, ETSI10_WORLD, "LV", 40, 160, 0},
 	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
@@ -564,16 +630,20 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MONACO, ETSI10_WORLD, "MC", 40, 160, 0},
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
 	{CTRY_MONTENEGRO, ETSI10_WORLD, "ME", 40, 160, 0},
+	{CTRY_MONTSERRAT, ETSI10_WORLD, "MS", 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, ETSI10_WORLD, "AN", 40, 160, 0},
+	{CTRY_NEW_CALEDONIA, ETSI10_WORLD, "NC", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", 40, 160, 0},
 	{CTRY_NIGERIA, APL8_WORLD, "NG", 40, 160, 0},
 	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, "MP", 40, 160, 0},
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
+	{CTRY_NIUE, ETSI10_WORLD, "NU", 40, 160, 0},
+	{CTRY_NORFOLK_ISLAND, FCC6_WORLD, "NF", 40, 160, 0},
 	{CTRY_NORWAY, ETSI10_WORLD, "NO", 40, 160, 0},
 	{CTRY_OMAN, ETSI1_WORLD, "OM", 40, 160, 0},
 	{CTRY_PAKISTAN, APL1_ETSIC, "PK", 40, 160, 0},
@@ -592,6 +662,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0},
 	{CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0},
 	{CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0},
+	{CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI10_WORLD, "SH",
+	 40, 160, 0},
 	{CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", 40, 160, 0},
 	{CTRY_SAINT_LUCIA, APL10_WORLD, "LC", 40, 160, 0},
 	{CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", 40, 160, 0},
@@ -599,16 +671,20 @@ 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_SAN_MARINO, FCC3_FCCA, "SM", 40, 160, 0},
+	{CTRY_SAO_TOME_AND_PRINCIPE, FCC3_WORLD, "ST", 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},
+	{CTRY_SINT_MAARTEN, ETSI10_WORLD, "SX", 40, 160, 0},
 	{CTRY_SLOVAKIA, ETSI10_WORLD, "SK", 40, 160, 0},
 	{CTRY_SLOVENIA, ETSI10_WORLD, "SI", 40, 160, 0},
 	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", 40, 160, 0},
 	{CTRY_SPAIN, ETSI10_WORLD, "ES", 40, 160, 0},
 	{CTRY_SURINAME, ETSI1_WORLD, "SR", 40, 160, 0},
 	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", 40, 20, 0},
+	{CTRY_SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, "SJ", 40, 160, 0},
 	{CTRY_SWEDEN, ETSI10_WORLD, "SE", 40, 160, 0},
 	{CTRY_SWITZERLAND, ETSI10_WORLD, "CH", 40, 160, 0},
 	{CTRY_TAIWAN, FCC3_FCCA, "TW", 40, 160, 0},
@@ -624,12 +700,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0},
 	{CTRY_UNITED_KINGDOM, ETSI10_WORLD, "GB", 40, 160, 0},
 	{CTRY_UNITED_STATES, FCC10_FCCA, "US", 40, 160, 0},
+	{CTRY_UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC10_FCCA, "UM", 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},
 	{CTRY_VENEZUELA, FCC2_ETSIC, "VE", 40, 160, 0},
 	{CTRY_VIET_NAM, FCC3_WORLD, "VN", 40, 80, 0},
 	{CTRY_VIRGIN_ISLANDS, FCC10_FCCA, "VI", 40, 160, 0},
+	{CTRY_VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, "VG", 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},
@@ -639,10 +718,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 #else
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 40, 160, 0},
+	{CTRY_ALAND_ISLANDS, FCC3_WORLD, "AX", 40, 160, 0},
 	{CTRY_ALBANIA, ETSI13_WORLD, "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
+	{CTRY_ANDORRA, ETSI3_WORLD, "AD", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
+	{CTRY_ANTIGUA_AND_BARBUDA, ETSI13_WORLD, "AG", 40, 160, 0},
 	{CTRY_ARGENTINA, APL17_ETSID, "AR", 40, 160, 0},
 	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
 	{CTRY_ARUBA, ETSI1_WORLD, "AW", 40, 160, 0},
@@ -665,7 +747,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_BULGARIA, ETSI13_WORLD, "BG", 40, 160, 0},
 	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", 40, 160, 0},
 	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", 40, 160, 0},
-	{CTRY_CANADA, FCC3_FCCA, "CA", 40, 160, 0},
+	{CTRY_CAMEROON, ETSI1_WORLD, "CM", 40, 160, 0},
+	{CTRY_CANADA, FCC6_FCCA, "CA", 40, 160, 0},
 	{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},
@@ -673,6 +756,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_COOK_ISLANDS, FCC3_WORLD, "CK", 40, 160, 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},
@@ -680,17 +764,20 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_CZECH, ETSI13_WORLD, "CZ", 40, 160, 0},
 	{CTRY_DENMARK, ETSI13_WORLD, "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC2_FCCA, "DM", 40, 160, 0},
-	{CTRY_DOMINICAN_REPUBLIC, FCC2_FCCA, "DO", 40, 160, 0},
+	{CTRY_DOMINICAN_REPUBLIC, FCC3_FCCA, "DO", 40, 160, 0},
 	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
 	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", 40, 20, 0},
 	{CTRY_ESTONIA, ETSI13_WORLD, "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
+	{CTRY_FALKLAND_ISLANDS, ETSI13_WORLD, "FK", 40, 160, 0},
+	{CTRY_FAROE_ISLANDS, ETSI13_WORLD, "FO", 40, 160, 0},
 	{CTRY_FINLAND, ETSI13_WORLD, "FI", 40, 160, 0},
 	{CTRY_FRANCE, ETSI13_WORLD, "FR", 40, 160, 0},
 	{CTRY_FRENCH_GUIANA, ETSI13_WORLD, "GF", 40, 160, 0},
 	{CTRY_FRENCH_POLYNESIA, ETSI13_WORLD, "PF", 40, 160, 0},
-	{CTRY_GEORGIA, ETSI4_WORLD, "GE", 40, 160, 0},
+	{CTRY_FRENCH_SOUTHERN_TERRITORIES, ETSI13_WORLD, "TF", 40, 160, 0},
+	{CTRY_GEORGIA, ETSI1_WORLD, "GE", 40, 160, 0},
 	{CTRY_GERMANY, ETSI13_WORLD, "DE", 40, 160, 0},
 	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
 	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", 40, 160, 0},
@@ -700,8 +787,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", 40, 160, 0},
 	{CTRY_GUAM, FCC3_FCCA, "GU", 40, 160, 0},
 	{CTRY_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
+	{CTRY_GUERNSEY, ETSI13_WORLD, "GG", 40, 160, 0},
 	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
 	{CTRY_HAITI, FCC3_FCCA, "HT", 40, 160, 0},
+	{CTRY_HEARD_ISLAND_AND_MCDONALD_ISLANDS, FCC6_WORLD, "HM", 40, 160, 0},
+	{CTRY_HOLY_SEE, ETSI13_WORLD, "VA", 40, 160, 0},
 	{CTRY_HONDURAS, FCC13_WORLD, "HN", 40, 160, 0},
 	{CTRY_HONG_KONG, FCC3_WORLD, "HK", 40, 160, 0},
 	{CTRY_HUNGARY, ETSI13_WORLD, "HU", 40, 160, 0},
@@ -710,13 +800,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", 40, 20, 0},
 	{CTRY_IRAQ, ETSI1_WORLD, "IQ", 40, 160, 0},
 	{CTRY_IRELAND, ETSI13_WORLD, "IE", 40, 160, 0},
+	{CTRY_ISLE_OF_MAN, ETSI13_WORLD, "IM", 40, 160, 0},
 	{CTRY_ISRAEL, ETSI3_WORLD, "IL", 40, 160, 0},
 	{CTRY_ITALY, ETSI13_WORLD, "IT", 40, 160,  0},
 	{CTRY_JAMAICA, FCC13_WORLD, "JM", 40, 160, 0},
+	{CTRY_JERSEY, ETSI13_WORLD, "JE", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
-	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", 40, 0, 0},
-	{CTRY_KENYA, APL12_WORLD, "KE", 40, 160, 0},
-	{CTRY_KOREA_ROC, APL9_WORLD, "KR", 40, 160, 0},
+	{CTRY_KAZAKHSTAN, MKK5_MKKC, "KZ", 40, 160, 0},
+	{CTRY_KENYA, ETSI13_WORLD, "KE", 40, 160, 0},
+	{CTRY_KOREA_ROC, APL9_MKKC, "KR", 40, 160, 0},
 	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
 	{CTRY_LATVIA, ETSI13_WORLD, "LV", 40, 160, 0},
 	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
@@ -741,16 +833,20 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MONACO, ETSI13_WORLD, "MC", 40, 160, 0},
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
 	{CTRY_MONTENEGRO, ETSI13_WORLD, "ME", 40, 160, 0},
+	{CTRY_MONTSERRAT, ETSI13_WORLD, "MS", 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},
 	{CTRY_NETHERLANDS_ANTILLES, ETSI13_WORLD, "AN", 40, 160, 0},
+	{CTRY_NEW_CALEDONIA, ETSI13_WORLD, "NC", 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_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
+	{CTRY_NIUE, ETSI13_WORLD, "NU", 40, 160, 0},
+	{CTRY_NORFOLK_ISLAND, FCC6_WORLD, "NF", 40, 160, 0},
 	{CTRY_NORWAY, ETSI13_WORLD, "NO", 40, 160, 0},
 	{CTRY_OMAN, ETSI1_WORLD, "OM", 40, 160, 0},
 	{CTRY_PAKISTAN, APL1_ETSIC, "PK", 40, 160, 0},
@@ -769,6 +865,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0},
 	{CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0},
 	{CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0},
+	{CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI13_WORLD, "SH",
+	 40, 160, 0},
 	{CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", 40, 160, 0},
 	{CTRY_SAINT_LUCIA, APL10_WORLD, "LC", 40, 160, 0},
 	{CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", 40, 160, 0},
@@ -776,16 +874,20 @@ 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_SAN_MARINO, FCC3_FCCA, "SM", 40, 160, 0},
+	{CTRY_SAO_TOME_AND_PRINCIPE, FCC3_WORLD, "ST", 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},
+	{CTRY_SINT_MAARTEN, ETSI13_WORLD, "SX", 40, 160, 0},
 	{CTRY_SLOVAKIA, ETSI13_WORLD, "SK", 40, 160, 0},
 	{CTRY_SLOVENIA, ETSI13_WORLD, "SI", 40, 160, 0},
 	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", 40, 160, 0},
 	{CTRY_SPAIN, ETSI13_WORLD, "ES", 40, 160, 0},
 	{CTRY_SURINAME, ETSI1_WORLD, "SR", 40, 160, 0},
 	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", 40, 20, 0},
+	{CTRY_SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, "SJ", 40, 160, 0},
 	{CTRY_SWEDEN, ETSI13_WORLD, "SE", 40, 160, 0},
 	{CTRY_SWITZERLAND, ETSI13_WORLD, "CH", 40, 160, 0},
 	{CTRY_TAIWAN, FCC3_FCCA, "TW", 40, 160, 0},
@@ -801,12 +903,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0},
 	{CTRY_UNITED_KINGDOM, ETSI13_WORLD, "GB", 40, 160, 0},
 	{CTRY_UNITED_STATES, FCC3_FCCA, "US", 40, 160, 0},
+	{CTRY_UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC3_FCCA, "UM", 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},
 	{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_BRITISH, ETSI13_WORLD, "VG", 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},
@@ -824,6 +929,7 @@ enum reg_domains_2g {
 	MKKC,
 	ETSIC,
 	ETSID,
+	KRRA,
 	WORLD_2G_1,
 	WORLD_2G_2,
 	WORLD_2G_3,
@@ -877,6 +983,7 @@ enum reg_domains_5g {
 	MKK10,
 	MKK11,
 	MKK16,
+	MKK17,
 	WORLD_5G_1,
 	WORLD_5G_2,
 };
@@ -923,6 +1030,8 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{APL6_WORLD, APL6, WORLD},
 	{APL8_WORLD, APL8, WORLD},
 	{APL9_WORLD, APL9, WORLD},
+	{APL9_MKKC, APL9, MKKC},
+	{APL9_KRRA, APL9, KRRA},
 	{APL10_WORLD, APL10, WORLD},
 	{APL11_FCCA, APL11, FCCA},
 	{APL12_WORLD, APL12, WORLD},
@@ -940,6 +1049,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{MKK5_MKKC, MKK5, MKKC},
 	{MKK11_MKKC, MKK11, MKKC},
 	{MKK16_MKKC, MKK16, MKKC},
+	{MKK17_MKKC, MKK17, MKKC},
 
 	{WORLD_60, WORLD_5G_2, WORLD_2G_3},
 	{WORLD_61, WORLD_5G_2, WORLD_2G_3},
@@ -997,6 +1107,7 @@ const struct regdomain regdomains_2g[] = {
 	[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} },
+	[KRRA]  = {CTL_KOR, DFS_UNINIT_REGION, 0, 0, 1,  {CHAN_1_13_4} },
 	[WORLD_2G_1] = {CTL_NONE, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_11_2} },
 	[WORLD_2G_2] = {CTL_NONE, DFS_UNINIT_REGION, 0, 0, 2,
 			{CHAN_1_11_2, CHAN_12_13_1} },
@@ -1280,10 +1391,10 @@ const struct regdomain regdomains_5g[] = {
 	[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_2,
-						     CHAN_5250_5330_1,
-						     CHAN_5490_5730_5,
-						     CHAN_5735_5835_2} },
+	[APL9] = {CTL_MKK, DFS_KR_REGION, 2, 6, 4,   {CHAN_5170_5250_2,
+						      CHAN_5250_5330_1,
+						      CHAN_5490_5730_6,
+						      CHAN_5735_5835_1} },
 
 	[APL10] = {CTL_ETSI, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_2,
 						       CHAN_5250_5330_4,
@@ -1339,8 +1450,8 @@ const struct regdomain regdomains_5g[] = {
 
 	[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,
+	[MKK5] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 3, {CHAN_5170_5250_8,
+						     CHAN_5250_5330_12,
 						     CHAN_5490_5710_7} },
 
 	[MKK11] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 5, {CHAN_4910_4990_1,
@@ -1351,6 +1462,10 @@ const struct regdomain regdomains_5g[] = {
 
 	[MKK16] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 1, {CHAN_5490_5710_6} },
 
+	[MKK17] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 3, {CHAN_5170_5250_8,
+						      CHAN_5250_5330_12,
+						      CHAN_5490_5710_7} },
+
 	[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 2,
 			{CHAN_5170_5330_1,
 			 CHAN_5735_5835_5} },