diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c
index b35096f27f23..3dde49352cac 100644
--- a/umac/regulatory/core/src/reg_db.c
+++ b/umac/regulatory/core/src/reg_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -33,11 +33,9 @@ enum country_code {
 	CTRY_AMERICAN_SAMOA = 16,
 	CTRY_ANGUILLA = 660,
 	CTRY_ARGENTINA = 32,
-	CTRY_ARGENTINA2 = 5003,
 	CTRY_ARMENIA = 51,
 	CTRY_ARUBA = 533,
 	CTRY_AUSTRALIA = 36,
-	CTRY_AUSTRALIA2 = 5000,
 	CTRY_AUSTRIA = 40,
 	CTRY_AZERBAIJAN = 31,
 	CTRY_BAHAMAS = 44,
@@ -46,7 +44,6 @@ enum country_code {
 	CTRY_BARBADOS = 52,
 	CTRY_BELARUS = 112,
 	CTRY_BELGIUM = 56,
-	CTRY_BELGIUM2 = 4101,
 	CTRY_BELIZE = 84,
 	CTRY_BERMUDA = 60,
 	CTRY_BHUTAN = 64,
@@ -58,7 +55,6 @@ enum country_code {
 	CTRY_BURKINA_FASO = 854,
 	CTRY_CAMBODIA = 116,
 	CTRY_CANADA = 124,
-	CTRY_CANADA2 = 5001,
 	CTRY_CAYMAN_ISLANDS = 136,
 	CTRY_CENTRAL_AFRICA_REPUBLIC = 140,
 	CTRY_CHAD = 148,
@@ -100,8 +96,8 @@ enum country_code {
 	CTRY_HUNGARY = 348,
 	CTRY_ICELAND = 352,
 	CTRY_INDIA = 356,
-	CTRY_INDIA2 = 5006,
 	CTRY_INDONESIA = 360,
+	CTRY_IRAQ = 368,
 	CTRY_IRELAND = 372,
 	CTRY_ISRAEL = 376,
 	CTRY_ITALY = 380,
@@ -110,7 +106,6 @@ enum country_code {
 	CTRY_KAZAKHSTAN = 398,
 	CTRY_KENYA = 404,
 	CTRY_KOREA_ROC = 410,
-	CTRY_KOREA_ROC3 = 412,
 	CTRY_KUWAIT = 414,
 	CTRY_LATVIA = 428,
 	CTRY_LEBANON = 422,
@@ -193,9 +188,6 @@ enum country_code {
 	CTRY_UAE = 784,
 	CTRY_UNITED_KINGDOM = 826,
 	CTRY_UNITED_STATES = 840,
-	CTRY_UNITED_STATES1 = 841,
-	CTRY_UNITED_STATES_PS = 842,
-	CTRY_UNITED_STATES2 = 843,
 	CTRY_URUGUAY = 858,
 	CTRY_UZBEKISTAN = 860,
 	CTRY_VANUATU = 548,
@@ -278,18 +270,17 @@ enum reg_domain {
 	WORLD_6C = 0x6C,
 };
 
+#ifndef CONFIG_MCL_REGDB
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", "AF" , 40, 160, 0},
 	{CTRY_ALBANIA, ETSI1_WORLD, "AL", "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AS", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", "AI", 40, 160, 0},
-	{CTRY_ARGENTINA, FCC3_WORLD, "AR1", "AR", 40, 160, 0},
-	{CTRY_ARGENTINA2, APL16_WORLD, "AR", "AR", 40, 160, 0},
+	{CTRY_ARGENTINA, APL16_WORLD, "AR", "AR", 40, 160, 0},
 	{CTRY_ARMENIA, ETSI4_WORLD, "AM", "AM", 40, 20, 0},
 	{CTRY_ARUBA, ETSI1_WORLD, "AW", "AW", 40, 160, 0},
-	{CTRY_AUSTRALIA, FCC3_WORLD, "AU1", "AU", 40, 160, 0},
-	{CTRY_AUSTRALIA2, FCC6_WORLD, "AU", "AU", 40, 160, 0},
+	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AU", 40, 160, 0},
 	{CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AT", 40, 160, 0},
 	{CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZ", 40, 160, 0},
 	{CTRY_BAHAMAS, FCC3_WORLD, "BS", "BS", 40, 160, 0},
@@ -298,8 +289,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_BARBADOS, FCC2_WORLD, "BB", "BB", 40, 160, 0},
 	{CTRY_BELARUS, ETSI1_WORLD, "BY", "BY", 40, 160, 0},
 	{CTRY_BELGIUM, ETSI1_WORLD, "BE", "BE", 40, 160, 0},
-	{CTRY_BELGIUM2, ETSI4_WORLD, "BEL", "BE", 40, 160, 0},
-	{CTRY_BELIZE, FCC3_ETSIC, "BZ", "BZ", 40, 160, 0},
+	{CTRY_BELIZE, ETSI8_WORLD, "BZ", "BZ", 40, 160, 0},
 	{CTRY_BERMUDA, FCC3_FCCA, "BM", "BM", 40, 160, 0},
 	{CTRY_BHUTAN, ETSI1_WORLD, "BT", "BT", 40, 160, 0},
 	{CTRY_BOLIVIA, APL8_WORLD, "BO", "BO", 40, 160, 0},
@@ -309,12 +299,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_BULGARIA, ETSI1_WORLD, "BG", "BG", 40, 160, 0},
 	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", "BF", 40, 160, 0},
 	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", "KH", 40, 160, 0},
-	{CTRY_CANADA, FCC3_FCCA, "CA1", "CA", 40, 160, 0},
-	{CTRY_CANADA2, FCC6_FCCA, "CA", "CA", 40, 160, 0},
+	{CTRY_CANADA, FCC6_FCCA, "CA", "CA", 40, 160, 0},
 	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", "KY", 40, 160, 0},
 	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", "CF", 40, 40, 0},
 	{CTRY_CHAD, ETSI1_WORLD, "TD", "TD", 40, 160, 0},
-	{CTRY_CHILE, APL6_WORLD, "CL", "CL", 40, 160, 0},
+	{CTRY_CHILE, APL23_WORLD, "CL", "CL", 40, 160, 0},
 	{CTRY_CHINA, APL14_WORLD, "CN", "CN", 40, 160, 0},
 	{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", "CX", 40, 160, 0},
 	{CTRY_COLOMBIA, FCC3_WORLD, "CO", "CO", 40, 160, 0},
@@ -352,17 +341,16 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_HUNGARY, ETSI1_WORLD, "HU", "HU" , 40, 160, 0},
 	{CTRY_ICELAND, ETSI1_WORLD, "IS", "IS" , 40, 160, 0},
 	{CTRY_INDIA, APL15_WORLD, "IN", "IN", 40, 160, 0},
-	{CTRY_INDIA2, APL19_ETSIC, "IN", "IN", 40, 160, 0},
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", "ID", 40, 20, 0},
+	{CTRY_IRAQ, ETSI1_WORLD, "IQ", "IQ", 40, 160, 0},
 	{CTRY_IRELAND, ETSI1_WORLD, "IE", "IE", 40, 160, 0},
 	{CTRY_ISRAEL, ETSI3_WORLD, "IL", "IL", 40, 160, 0},
 	{CTRY_ITALY, ETSI1_WORLD, "IT", "IT", 40, 160,  0},
-	{CTRY_JAMAICA, FCC3_WORLD, "JM", "JM", 40, 160, 0},
+	{CTRY_JAMAICA, FCC13_WORLD, "JM", "JM", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", "JO", 40, 160, 0},
 	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KZ", 40, 0, 0},
 	{CTRY_KENYA, APL12_WORLD, "KE", "KE", 40, 160, 0},
 	{CTRY_KOREA_ROC, APL9_WORLD, "KR", "KR", 40, 160, 0},
-	{CTRY_KOREA_ROC3, APL9_WORLD, "K3", "KR", 40, 160, 0},
 	{CTRY_KUWAIT, ETSI3_WORLD, "KW", "KW", 40, 160, 0},
 	{CTRY_LATVIA, ETSI1_WORLD, "LV", "LV", 40, 160, 0},
 	{CTRY_LEBANON, FCC3_WORLD, "LB", "LB", 40, 160, 0},
@@ -388,8 +376,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", "MN", 40, 160, 0},
 	{CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "ME", 40, 160, 0},
 	{CTRY_MOROCCO, ETSI3_WORLD, "MA", "MA", 40, 160, 0},
-	{CTRY_NAMIBIA, APL9_WORLD, "NA", "NA", 40, 160, 0},
-	{CTRY_NEPAL, APL6_WORLD, "NP", "NP", 40, 160, 0},
+	{CTRY_NAMIBIA, APL20_WORLD, "NA", "NA", 40, 160, 0},
+	{CTRY_NEPAL, APL23_WORLD, "NP", "NP", 40, 160, 0},
 	{CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NP", 40, 160, 0},
 	{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "AN", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NZ", 40, 160, 0},
@@ -422,7 +410,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	 "VC" , 40, 160, 0},
 	{CTRY_SAMOA, ETSI1_WORLD, "WS", "WS", 40, 40, 0},
 	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", "SA", 40, 160, 0},
-	{CTRY_SENEGAL, FCC3_WORLD, "SN", "SN", 40, 160, 0},
+	{CTRY_SENEGAL, FCC13_WORLD, "SN", "SN", 40, 160, 0},
 	{CTRY_SERBIA, ETSI1_WORLD, "RS", "RS", 40, 160, 0},
 	{CTRY_SINGAPORE, FCC3_WORLD, "SG", "SG", 40, 160, 0},
 	{CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SK", 40, 160, 0},
@@ -445,10 +433,186 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UA", 40, 160, 0},
 	{CTRY_UAE, FCC3_WORLD, "AE", "AE", 40, 160, 0},
 	{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "GB", 40, 160, 0},
-	{CTRY_UNITED_STATES, FCC3_FCCA, "US", "US", 40, 160, 0},
-	{CTRY_UNITED_STATES1, FCC6_FCCA, "US1", "US", 40, 160, 0},
-	{CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "PS", 40, 160, 0},
-	{CTRY_UNITED_STATES2, FCC8_FCCA, "US2", "US", 40, 160, 0},
+	{CTRY_UNITED_STATES, FCC8_FCCA, "US", "US", 40, 160, 0},
+	{CTRY_URUGUAY, FCC2_WORLD, "UY", "UY", 40, 160, 0},
+	{CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", "UZ", 40, 160, 0},
+	{CTRY_VANUATU, FCC3_WORLD, "VU", "VU", 40, 160, 0},
+	{CTRY_VENEZUELA, FCC2_ETSIC, "VE", "VE", 40, 160, 0},
+	{CTRY_VIET_NAM, FCC3_WORLD, "VN", "VN", 40, 80, 0},
+	{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", "VI", 40, 160, 0},
+	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", "WF", 40, 160, 0},
+	{CTRY_YEMEN, NULL1_WORLD, "YE", "YE", 40, 0, 0},
+	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", "ZW", 40, 160, 0},
+	{CTRY_JAPAN15, MKK5_MKKC, "J15", "JP", 40, 160, 0},
+	{CTRY_JAPAN9, MKK3_MKKC, "J9", "JP", 40, 160, 0},
+	{CTRY_JAPAN48, MKK11_MKKC, "J48", "JP", 40, 160, 0},
+	{CTRY_JAPAN55, MKK5_MKKA, "J55", "JP", 40, 160, 0},
+	{CTRY_JAPAN60, MKK16_MKKC, "J60", "JP", 40, 160, 0},
+};
+#else
+const struct country_code_to_reg_domain g_all_countries[] = {
+	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", "AF", 40, 160, 0},
+	{CTRY_ALBANIA, ETSI1_WORLD, "AL", "AL", 40, 160, 0},
+	{CTRY_ALGERIA, APL13_WORLD, "DZ", "DZ", 40, 160, 0},
+	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AS", 40, 160, 0},
+	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", "AI", 40, 160, 0},
+	{CTRY_ARGENTINA, APL17_ETSID, "AR1", "AR", 40, 160, 0},
+	{CTRY_ARMENIA, ETSI4_WORLD, "AM", "AM", 40, 20, 0},
+	{CTRY_ARUBA, ETSI1_WORLD, "AW", "AW", 40, 160, 0},
+	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AU", 40, 160, 0},
+	{CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AT", 40, 160, 0},
+	{CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZ", 40, 160, 0},
+	{CTRY_BAHAMAS, FCC3_WORLD, "BS", "BS", 40, 160, 0},
+	{CTRY_BAHRAIN, APL15_WORLD, "BH", "BH", 40, 20, 0},
+	{CTRY_BANGLADESH, APL1_WORLD, "BD", "BD", 40, 160, 0},
+	{CTRY_BARBADOS, FCC2_WORLD, "BB", "BB", 40, 160, 0},
+	{CTRY_BELARUS, ETSI1_WORLD, "BY", "BY", 40, 160, 0},
+	{CTRY_BELGIUM, ETSI1_WORLD, "BE", "BE", 40, 160, 0},
+	{CTRY_BELIZE, ETSI8_WORLD, "BZ", "BZ", 40, 160, 0},
+	{CTRY_BERMUDA, FCC3_FCCA, "BM", "BM", 40, 160, 0},
+	{CTRY_BHUTAN, ETSI1_WORLD, "BT", "BT", 40, 160, 0},
+	{CTRY_BOLIVIA, APL8_WORLD, "BO", "BO", 40, 160, 0},
+	{CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BA", 40, 160, 0},
+	{CTRY_BRAZIL, FCC3_ETSIC, "BR", "BR", 40, 160, 0},
+	{CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BN", 40, 160, 0},
+	{CTRY_BULGARIA, ETSI1_WORLD, "BG", "BG", 40, 160, 0},
+	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", "BF", 40, 160, 0},
+	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", "KH", 40, 160, 0},
+	{CTRY_CANADA, FCC3_FCCA, "CA", "CA", 40, 160, 0},
+	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", "KY", 40, 160, 0},
+	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", "CF", 40, 40, 0},
+	{CTRY_CHAD, ETSI1_WORLD, "TD", "TD", 40, 160, 0},
+	{CTRY_CHILE, APL23_WORLD, "CL", "CL", 40, 160, 0},
+	{CTRY_CHINA, APL14_WORLD, "CN", "CN", 40, 160, 0},
+	{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", "CX", 40, 160, 0},
+	{CTRY_COLOMBIA, FCC3_WORLD, "CO", "CO", 40, 160, 0},
+	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", "CR", 40, 20, 0},
+	{CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", "CI", 40, 160, 0},
+	{CTRY_CROATIA, ETSI1_WORLD, "HR", "HR", 40, 160, 0},
+	{CTRY_CYPRUS, ETSI1_WORLD, "CY", "CY", 40, 160, 0},
+	{CTRY_CZECH, ETSI1_WORLD, "CZ", "CZ", 40, 160, 0},
+	{CTRY_DENMARK, ETSI1_WORLD, "DK", "DK", 40, 160,  0},
+	{CTRY_DOMINICA, FCC2_FCCA, "DM", "DM", 40, 160, 0},
+	{CTRY_DOMINICAN_REPUBLIC, FCC2_FCCA, "DO", "DO", 40, 160, 0},
+	{CTRY_ECUADOR, FCC3_WORLD, "EC", "EC", 40, 20, 0},
+	{CTRY_EGYPT, ETSI3_WORLD, "EG", "EG", 40, 40, 0},
+	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", "SV", 40, 20, 0},
+	{CTRY_ESTONIA, ETSI1_WORLD, "EE", "EE", 40, 160, 0},
+	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ET", 40, 160, 0},
+	{CTRY_FINLAND, ETSI1_WORLD, "FI", "FI", 40, 160, 0},
+	{CTRY_FRANCE, ETSI1_WORLD, "FR", "FR", 40, 160, 0},
+	{CTRY_FRENCH_GUIANA, ETSI1_WORLD, "GF", "GF", 40, 160, 0},
+	{CTRY_FRENCH_POLYNESIA, ETSI1_WORLD, "PF", "PF", 40, 160, 0},
+	{CTRY_GEORGIA, ETSI4_WORLD, "GE", "GE", 40, 160, 0},
+	{CTRY_GERMANY, ETSI1_WORLD, "DE", "DE", 40, 160, 0},
+	{CTRY_GHANA, FCC3_WORLD, "GH", "GH", 40, 160, 0},
+	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", "GI", 40, 160, 0},
+	{CTRY_GREECE, ETSI1_WORLD, "GR", "GR", 40, 160, 0},
+	{CTRY_GREENLAND, ETSI1_WORLD, "GL", "GL", 40, 160, 0},
+	{CTRY_GRENADA, FCC3_FCCA, "GD", "GD", 40, 160, 0},
+	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", "GP", 40, 160, 0},
+	{CTRY_GUAM, FCC3_FCCA, "GU", "GU", 40, 160, 0},
+	{CTRY_GUATEMALA, ETSI1_WORLD, "GT", "GT", 40, 160, 0},
+	{CTRY_GUYANA, APL1_ETSIC, "GY", "GY", 40, 160, 0},
+	{CTRY_HAITI, FCC3_FCCA, "HT", "HT", 40, 160, 0},
+	{CTRY_HONDURAS, FCC13_WORLD, "HN", "HN", 40, 160, 0},
+	{CTRY_HONG_KONG, FCC3_WORLD, "HK", "HK", 40, 160, 0},
+	{CTRY_HUNGARY, ETSI1_WORLD, "HU", "HU", 40, 160, 0},
+	{CTRY_ICELAND, ETSI1_WORLD, "IS", "IS", 40, 160, 0},
+	{CTRY_INDIA, APL15_WORLD, "IN", "IN", 40, 160, 0},
+	{CTRY_INDONESIA, APL2_ETSIC, "ID", "ID", 40, 20, 0},
+	{CTRY_IRAQ, ETSI1_WORLD, "IQ", "IQ", 40, 160, 0},
+	{CTRY_IRELAND, ETSI1_WORLD, "IE", "IE", 40, 160, 0},
+	{CTRY_ISRAEL, ETSI3_WORLD, "IL", "IL", 40, 160, 0},
+	{CTRY_ITALY, ETSI1_WORLD, "IT", "IT", 40, 160,  0},
+	{CTRY_JAMAICA, FCC13_WORLD, "JM", "JM", 40, 160, 0},
+	{CTRY_JORDAN, APL4_WORLD, "JO", "JO", 40, 160, 0},
+	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KZ", 40, 0, 0},
+	{CTRY_KENYA, APL12_WORLD, "KE", "KE", 40, 160, 0},
+	{CTRY_KOREA_ROC, APL9_WORLD, "KR", "KR", 40, 160, 0},
+	{CTRY_KUWAIT, ETSI3_WORLD, "KW", "KW", 40, 160, 0},
+	{CTRY_LATVIA, ETSI1_WORLD, "LV", "LV", 40, 160, 0},
+	{CTRY_LEBANON, FCC3_WORLD, "LB", "LB", 40, 160, 0},
+	{CTRY_LESOTHO, ETSI1_WORLD, "LS", "LS", 40, 160, 0},
+	{CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LI", 40, 160, 0},
+	{CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LT", 40, 160, 0},
+	{CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LU", 40, 160, 0},
+	{CTRY_MACAU, FCC3_WORLD, "MO", "MO", 40, 160, 0},
+	{CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MK", 40, 160, 0},
+	{CTRY_MALAWI, ETSI1_WORLD, "MW", "MW", 40, 160, 0},
+	{CTRY_MALAYSIA, FCC11_WORLD, "MY", "MY", 40, 160, 0},
+	{CTRY_MALDIVES, APL6_WORLD, "MV", "MV", 40, 160, 0},
+	{CTRY_MALTA, ETSI1_WORLD, "MT", "MT", 40, 160, 0},
+	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", "MH", 40, 160, 0},
+	{CTRY_MARTINIQUE, ETSI1_WORLD, "MQ", "MQ", 40, 160, 0},
+	{CTRY_MAURITANIA, ETSI1_WORLD, "MR", "MR", 40, 160, 0},
+	{CTRY_MAURITIUS, FCC3_WORLD, "MU", "MU", 40, 160, 0},
+	{CTRY_MAYOTTE, ETSI1_WORLD, "YT", "YT", 40, 160, 0},
+	{CTRY_MEXICO, FCC3_ETSIC, "MX", "MX", 40, 160, 0},
+	{CTRY_MICRONESIA, FCC3_FCCA, "FM", "FM", 40, 160, 0},
+	{CTRY_MOLDOVA, ETSI1_WORLD, "MD", "MD", 40, 160, 0},
+	{CTRY_MONACO, ETSI1_WORLD, "MC", "MC", 40, 160, 0},
+	{CTRY_MONGOLIA, FCC3_WORLD, "MN", "MN", 40, 160, 0},
+	{CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "ME", 40, 160, 0},
+	{CTRY_MOROCCO, ETSI3_WORLD, "MA", "MA", 40, 160, 0},
+	{CTRY_NAMIBIA, APL20_WORLD, "NA", "NA", 40, 160, 0},
+	{CTRY_NEPAL, APL23_WORLD, "NP", "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "AN", 40, 160, 0},
+	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NZ", 40, 160, 0},
+	{CTRY_NIGERIA, APL8_WORLD, "NG", "NG", 40, 160, 0},
+	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", "MP", 40, 160, 0},
+	{CTRY_NICARAGUA, FCC3_FCCA, "NI", "NI", 40, 160, 0},
+	{CTRY_NORWAY, ETSI1_WORLD, "NO", "NO", 40, 160, 0},
+	{CTRY_OMAN, ETSI1_WORLD, "OM", "OM", 40, 160, 0},
+	{CTRY_PAKISTAN, APL1_ETSIC, "PK", "PK", 40, 160, 0},
+	{CTRY_PALAU, FCC3_FCCA, "PW", "PW", 40, 160, 0},
+	{CTRY_PANAMA, FCC14_FCCB, "PA", "PA", 40, 160, 0},
+	{CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", "PG", 40, 160, 0},
+	{CTRY_PARAGUAY, FCC3_WORLD, "PY", "PY", 40, 160, 0},
+	{CTRY_PERU, FCC3_WORLD, "PE", "PE", 40, 160, 0},
+	{CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PH", 40, 160, 0},
+	{CTRY_POLAND, ETSI1_WORLD, "PL", "PL", 40, 160, 0},
+	{CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PT", 40, 160, 0},
+	{CTRY_PUERTO_RICO, FCC3_FCCA, "PR", "PR", 40, 160, 0},
+	{CTRY_QATAR, APL1_WORLD, "QA", "QA", 40, 160, 0},
+	{CTRY_REUNION, ETSI1_WORLD, "RE", "RE", 40, 160, 0},
+	{CTRY_ROMANIA, ETSI1_WORLD, "RO", "RO", 40, 160, 0},
+	{CTRY_RUSSIA, ETSI8_WORLD, "RU", "RU", 40, 160, 0},
+	{CTRY_RWANDA, FCC3_WORLD, "RW", "RW", 40, 160, 0},
+	{CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", "BL", 40, 160, 0},
+	{CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", "KN", 40, 160, 0},
+	{CTRY_SAINT_LUCIA, APL10_WORLD, "LC", "LC", 40, 160, 0},
+	{CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", "MF", 40, 160, 0},
+	{CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI1_WORLD, "PM", "PM", 40, 160, 0},
+	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD, "VC",
+	 "VC", 40, 160, 0},
+	{CTRY_SAMOA, ETSI1_WORLD, "WS", "WS", 40, 40, 0},
+	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", "SA", 40, 160, 0},
+	{CTRY_SENEGAL, FCC13_WORLD, "SN", "SN", 40, 160, 0},
+	{CTRY_SERBIA, ETSI1_WORLD, "RS", "RS", 40, 160, 0},
+	{CTRY_SINGAPORE, FCC3_WORLD, "SG", "SG", 40, 160, 0},
+	{CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SK", 40, 160, 0},
+	{CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SI", 40, 160, 0},
+	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "ZA", 40, 160, 0},
+	{CTRY_SPAIN, ETSI1_WORLD, "ES", "ES", 40, 160, 0},
+	{CTRY_SURINAME, ETSI1_WORLD, "SR", "SR", 40, 160, 0},
+	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", "LK", 40, 20, 0},
+	{CTRY_SWEDEN, ETSI1_WORLD, "SE", "SE", 40, 160, 0},
+	{CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "CH", 40, 160, 0},
+	{CTRY_TAIWAN, FCC3_FCCA, "TW", "TW", 40, 160, 0},
+	{CTRY_TANZANIA, APL1_WORLD, "TZ", "TZ", 40, 160, 0},
+	{CTRY_THAILAND, FCC3_WORLD, "TH", "TH", 40, 160, 0},
+	{CTRY_TOGO, ETSI1_WORLD, "TG", "TG", 40, 40, 0},
+	{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TT", 40, 160, 0},
+	{CTRY_TUNISIA, ETSI3_WORLD, "TN", "TN", 40, 160, 0},
+	{CTRY_TURKEY, ETSI1_WORLD, "TR", "TR", 40, 160, 0},
+	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", "TC", 40, 160, 0},
+	{CTRY_UGANDA, FCC3_WORLD, "UG", "UG", 40, 160, 0},
+	{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UA", 40, 160, 0},
+	{CTRY_UAE, FCC3_WORLD, "AE", "AE", 40, 160, 0},
+	{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "GB", 40, 160, 0},
+	{CTRY_UNITED_STATES, FCC8_FCCA, "US", "US", 40, 160, 0},
 	{CTRY_URUGUAY, FCC2_WORLD, "UY", "UY", 40, 160, 0},
 	{CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", "UZ", 40, 160, 0},
 	{CTRY_VANUATU, FCC3_WORLD, "VU", "VU", 40, 160, 0},
@@ -465,6 +629,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_JAPAN60, MKK16_MKKC, "J60", "JP", 40, 160, 0},
 	{CTRY_XA, MKK5_MKKA, "XA", "XA", 40, 160, 0},
 };
+#endif
 
 enum reg_domains_2g {
 	FCCA,