qcacmn: Add regulatory update-26 to reg db

Add Regdomain: ETSI14.
Add Regdomain pair: ETSI14_WORLD.
Change regdomain of Qatar to ETSI14_WORLD.
Change Japan ISO country code.
Remove Non-ISO JAPAN countries.
Remove Ch.144 and related straddle channels in APL9.
Increase 5.25-5.35 power in APL9.
Increase MKK5, MKK11, MKK16 powers.
Add channels and increase power for ETSI9.
Add 5GHz mid channels and increased power for FCC14.
Change regdomain of Mauritius to ETSI1_WORLD and ETSI13_WORLD.
Change Egypt Country Flags to allow VHT80, VHT160.

Change-Id: I10abf9f2edcb2d3f9a941ffc6b9188002d83973a
CRs-Fixed: 2216647

umac/regulatory/core/src/reg_db.c

@@ -197,11 +197,7 @@ enum country_code {
 	CTRY_WALLIS_AND_FUTUNA = 876,
 	CTRY_YEMEN = 887,
 	CTRY_ZIMBABWE = 716,
-	CTRY_JAPAN15 = 4015,
-	CTRY_JAPAN9 = 4009,
-	CTRY_JAPAN48 = 4048,
-	CTRY_JAPAN55 = 4055,
-	CTRY_JAPAN60 = 4060,
+	CTRY_JAPAN = 392,
 	CTRY_XA = 4100,
 };
 
@@ -232,6 +228,7 @@ enum reg_domain {
 	ETSI11_WORLD = 0x26,
 	ETSI12_WORLD = 0x28,
 	ETSI13_WORLD = 0x27,
+	ETSI14_WORLD = 0x29,
 
 	APL1_WORLD = 0x52,
 	APL1_ETSIC = 0x55,
@@ -275,362 +272,354 @@ enum reg_domain {
 
 #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, 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, 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, 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, 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, FCC1_FCCA, "DM", "DM", 40, 160, 0},
-	{CTRY_DOMINICAN_REPUBLIC, FCC1_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, FCC1_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, FCC3_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",
+	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 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_ANGUILLA, ETSI1_WORLD, "AI", 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},
+	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", 40, 160, 0},
+	{CTRY_AUSTRIA, ETSI1_WORLD, "AT", 40, 160, 0},
+	{CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", 40, 160, 0},
+	{CTRY_BAHAMAS, FCC3_WORLD, "BS", 40, 160, 0},
+	{CTRY_BAHRAIN, APL15_WORLD, "BH", 40, 20, 0},
+	{CTRY_BANGLADESH, APL1_WORLD, "BD", 40, 160, 0},
+	{CTRY_BARBADOS, FCC2_WORLD, "BB", 40, 160, 0},
+	{CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, 0},
+	{CTRY_BELGIUM, ETSI1_WORLD, "BE", 40, 160, 0},
+	{CTRY_BELIZE, ETSI8_WORLD, "BZ", 40, 160, 0},
+	{CTRY_BERMUDA, FCC3_FCCA, "BM", 40, 160, 0},
+	{CTRY_BHUTAN, ETSI1_WORLD, "BT", 40, 160, 0},
+	{CTRY_BOLIVIA, APL8_WORLD, "BO", 40, 160, 0},
+	{CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", 40, 160, 0},
+	{CTRY_BRAZIL, FCC3_ETSIC, "BR", 40, 160, 0},
+	{CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", 40, 160, 0},
+	{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_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},
+	{CTRY_CHILE, APL23_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_COTE_DIVOIRE, FCC3_WORLD, "CI", 40, 160, 0},
+	{CTRY_CROATIA, ETSI1_WORLD, "HR", 40, 160, 0},
+	{CTRY_CYPRUS, ETSI1_WORLD, "CY", 40, 160, 0},
+	{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_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_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_GERMANY, ETSI1_WORLD, "DE", 40, 160, 0},
+	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
+	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", 40, 160, 0},
+	{CTRY_GREECE, ETSI1_WORLD, "GR", 40, 160, 0},
+	{CTRY_GREENLAND, ETSI1_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_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
+	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
+	{CTRY_HAITI, FCC3_FCCA, "HT", 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},
+	{CTRY_ICELAND, ETSI1_WORLD, "IS", 40, 160, 0},
+	{CTRY_INDIA, APL15_WORLD, "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},
+	{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_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_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
+	{CTRY_LATVIA, ETSI1_WORLD, "LV", 40, 160, 0},
+	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
+	{CTRY_LESOTHO, ETSI1_WORLD, "LS", 40, 160, 0},
+	{CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", 40, 160, 0},
+	{CTRY_LITHUANIA, ETSI1_WORLD, "LT", 40, 160, 0},
+	{CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", 40, 160, 0},
+	{CTRY_MACAU, FCC3_WORLD, "MO", 40, 160, 0},
+	{CTRY_MACEDONIA, ETSI1_WORLD, "MK", 40, 160, 0},
+	{CTRY_MALAWI, ETSI1_WORLD, "MW", 40, 160, 0},
+	{CTRY_MALAYSIA, FCC11_WORLD, "MY", 40, 160, 0},
+	{CTRY_MALDIVES, APL6_WORLD, "MV", 40, 160, 0},
+	{CTRY_MALTA, ETSI1_WORLD, "MT", 40, 160, 0},
+	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", 40, 160, 0},
+	{CTRY_MARTINIQUE, ETSI1_WORLD, "MQ", 40, 160, 0},
+	{CTRY_MAURITANIA, ETSI1_WORLD, "MR", 40, 160, 0},
+	{CTRY_MAURITIUS, ETSI1_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, ETSI1_WORLD, "MD", 40, 160, 0},
+	{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_MOROCCO, ETSI3_WORLD, "MA", 40, 160, 0},
+	{CTRY_NAMIBIA, APL20_WORLD, "NA", 40, 160, 0},
+	{CTRY_NEPAL, APL23_WORLD, "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS, ETSI1_WORLD, "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS_ANTILLES, ETSI1_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_NICARAGUA, FCC3_FCCA, "NI", 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},
+	{CTRY_PALAU, FCC3_FCCA, "PW", 40, 160, 0},
+	{CTRY_PANAMA, FCC14_FCCB, "PA", 40, 160, 0},
+	{CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", 40, 160, 0},
+	{CTRY_PARAGUAY, FCC3_WORLD, "PY", 40, 160, 0},
+	{CTRY_PERU, FCC3_WORLD, "PE", 40, 160, 0},
+	{CTRY_PHILIPPINES, FCC3_WORLD, "PH", 40, 160, 0},
+	{CTRY_POLAND, ETSI1_WORLD, "PL", 40, 160, 0},
+	{CTRY_PORTUGAL, ETSI1_WORLD, "PT", 40, 160, 0},
+	{CTRY_PUERTO_RICO, FCC3_FCCA, "PR", 40, 160, 0},
+	{CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0},
+	{CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0},
+	{CTRY_ROMANIA, ETSI1_WORLD, "RO", 40, 160, 0},
+	{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_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},
+	{CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI1_WORLD, "PM", 40, 160, 0},
+	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD,
 	 "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},
-	{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},
+	{CTRY_SAMOA, ETSI1_WORLD, "WS", 40, 40, 0},
+	{CTRY_SAUDI_ARABIA, ETSI1_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_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_SWEDEN, ETSI1_WORLD, "SE", 40, 160, 0},
+	{CTRY_SWITZERLAND, ETSI1_WORLD, "CH", 40, 160, 0},
+	{CTRY_TAIWAN, FCC3_FCCA, "TW", 40, 160, 0},
+	{CTRY_TANZANIA, APL1_WORLD, "TZ", 40, 160, 0},
+	{CTRY_THAILAND, FCC3_WORLD, "TH", 40, 160, 0},
+	{CTRY_TOGO, ETSI1_WORLD, "TG", 40, 40, 0},
+	{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", 40, 160, 0},
+	{CTRY_TUNISIA, ETSI3_WORLD, "TN", 40, 160, 0},
+	{CTRY_TURKEY, ETSI1_WORLD, "TR", 40, 160, 0},
+	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", 40, 160, 0},
+	{CTRY_UGANDA, FCC3_WORLD, "UG", 40, 160, 0},
+	{CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, 0},
+	{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_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_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},
+	{CTRY_JAPAN, MKK5_MKKC, "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, ETSI13_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, ETSI13_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, ETSI13_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, ETSI13_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, ETSI13_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, ETSI13_WORLD, "HR", "HR", 40, 160, 0},
-	{CTRY_CYPRUS, ETSI13_WORLD, "CY", "CY", 40, 160, 0},
-	{CTRY_CZECH, ETSI13_WORLD, "CZ", "CZ", 40, 160, 0},
-	{CTRY_DENMARK, ETSI13_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, ETSI13_WORLD, "EE", "EE", 40, 160, 0},
-	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ET", 40, 160, 0},
-	{CTRY_FINLAND, ETSI13_WORLD, "FI", "FI", 40, 160, 0},
-	{CTRY_FRANCE, ETSI13_WORLD, "FR", "FR", 40, 160, 0},
-	{CTRY_FRENCH_GUIANA, ETSI13_WORLD, "GF", "GF", 40, 160, 0},
-	{CTRY_FRENCH_POLYNESIA, ETSI13_WORLD, "PF", "PF", 40, 160, 0},
-	{CTRY_GEORGIA, ETSI4_WORLD, "GE", "GE", 40, 160, 0},
-	{CTRY_GERMANY, ETSI13_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, ETSI13_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, ETSI13_WORLD, "HU", "HU", 40, 160, 0},
-	{CTRY_ICELAND, ETSI13_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, ETSI13_WORLD, "IE", "IE", 40, 160, 0},
-	{CTRY_ISRAEL, ETSI3_WORLD, "IL", "IL", 40, 160, 0},
-	{CTRY_ITALY, ETSI13_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, ETSI13_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, ETSI13_WORLD, "LI", "LI", 40, 160, 0},
-	{CTRY_LITHUANIA, ETSI13_WORLD, "LT", "LT", 40, 160, 0},
-	{CTRY_LUXEMBOURG, ETSI13_WORLD, "LU", "LU", 40, 160, 0},
-	{CTRY_MACAU, FCC3_WORLD, "MO", "MO", 40, 160, 0},
-	{CTRY_MACEDONIA, ETSI13_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, ETSI13_WORLD, "MT", "MT", 40, 160, 0},
-	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", "MH", 40, 160, 0},
-	{CTRY_MARTINIQUE, ETSI13_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, ETSI13_WORLD, "MD", "MD", 40, 160, 0},
-	{CTRY_MONACO, ETSI13_WORLD, "MC", "MC", 40, 160, 0},
-	{CTRY_MONGOLIA, FCC3_WORLD, "MN", "MN", 40, 160, 0},
-	{CTRY_MONTENEGRO, ETSI13_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, ETSI13_WORLD, "NL", "NP", 40, 160, 0},
-	{CTRY_NETHERLANDS_ANTILLES, ETSI13_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, ETSI13_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, ETSI13_WORLD, "PL", "PL", 40, 160, 0},
-	{CTRY_PORTUGAL, ETSI13_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, ETSI13_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, ETSI13_WORLD, "PM", "PM", 40, 160, 0},
+	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 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_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
+	{CTRY_ARGENTINA, APL17_ETSID, "AR1", 40, 160, 0},
+	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
+	{CTRY_ARUBA, ETSI1_WORLD, "AW", 40, 160, 0},
+	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", 40, 160, 0},
+	{CTRY_AUSTRIA, ETSI13_WORLD, "AT", 40, 160, 0},
+	{CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", 40, 160, 0},
+	{CTRY_BAHAMAS, FCC3_WORLD, "BS", 40, 160, 0},
+	{CTRY_BAHRAIN, APL15_WORLD, "BH", 40, 20, 0},
+	{CTRY_BANGLADESH, APL1_WORLD, "BD", 40, 160, 0},
+	{CTRY_BARBADOS, FCC2_WORLD, "BB", 40, 160, 0},
+	{CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, 0},
+	{CTRY_BELGIUM, ETSI13_WORLD, "BE", 40, 160, 0},
+	{CTRY_BELIZE, ETSI8_WORLD, "BZ", 40, 160, 0},
+	{CTRY_BERMUDA, FCC3_FCCA, "BM", 40, 160, 0},
+	{CTRY_BHUTAN, ETSI1_WORLD, "BT", 40, 160, 0},
+	{CTRY_BOLIVIA, APL8_WORLD, "BO", 40, 160, 0},
+	{CTRY_BOSNIA_HERZ, ETSI13_WORLD, "BA", 40, 160, 0},
+	{CTRY_BRAZIL, FCC3_ETSIC, "BR", 40, 160, 0},
+	{CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", 40, 160, 0},
+	{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_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_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_COTE_DIVOIRE, FCC3_WORLD, "CI", 40, 160, 0},
+	{CTRY_CROATIA, ETSI13_WORLD, "HR", 40, 160, 0},
+	{CTRY_CYPRUS, ETSI13_WORLD, "CY", 40, 160, 0},
+	{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_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_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_GERMANY, ETSI13_WORLD, "DE", 40, 160, 0},
+	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
+	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", 40, 160, 0},
+	{CTRY_GREECE, ETSI13_WORLD, "GR", 40, 160, 0},
+	{CTRY_GREENLAND, ETSI1_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_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
+	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
+	{CTRY_HAITI, FCC3_FCCA, "HT", 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},
+	{CTRY_ICELAND, ETSI13_WORLD, "IS", 40, 160, 0},
+	{CTRY_INDIA, APL15_WORLD, "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},
+	{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_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_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
+	{CTRY_LATVIA, ETSI13_WORLD, "LV", 40, 160, 0},
+	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
+	{CTRY_LESOTHO, ETSI1_WORLD, "LS", 40, 160, 0},
+	{CTRY_LIECHTENSTEIN, ETSI13_WORLD, "LI", 40, 160, 0},
+	{CTRY_LITHUANIA, ETSI13_WORLD, "LT", 40, 160, 0},
+	{CTRY_LUXEMBOURG, ETSI13_WORLD, "LU", 40, 160, 0},
+	{CTRY_MACAU, FCC3_WORLD, "MO", 40, 160, 0},
+	{CTRY_MACEDONIA, ETSI13_WORLD, "MK", 40, 160, 0},
+	{CTRY_MALAWI, ETSI1_WORLD, "MW", 40, 160, 0},
+	{CTRY_MALAYSIA, FCC11_WORLD, "MY", 40, 160, 0},
+	{CTRY_MALDIVES, APL6_WORLD, "MV", 40, 160, 0},
+	{CTRY_MALTA, ETSI13_WORLD, "MT", 40, 160, 0},
+	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", 40, 160, 0},
+	{CTRY_MARTINIQUE, ETSI13_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_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
+	{CTRY_MONTENEGRO, ETSI13_WORLD, "ME", 40, 160, 0},
+	{CTRY_MOROCCO, ETSI3_WORLD, "MA", 40, 160, 0},
+	{CTRY_NAMIBIA, APL20_WORLD, "NA", 40, 160, 0},
+	{CTRY_NEPAL, APL23_WORLD, "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS, ETSI13_WORLD, "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS_ANTILLES, ETSI13_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_NICARAGUA, FCC3_FCCA, "NI", 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},
+	{CTRY_PALAU, FCC3_FCCA, "PW", 40, 160, 0},
+	{CTRY_PANAMA, FCC14_FCCB, "PA", 40, 160, 0},
+	{CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", 40, 160, 0},
+	{CTRY_PARAGUAY, FCC3_WORLD, "PY", 40, 160, 0},
+	{CTRY_PERU, FCC3_WORLD, "PE", 40, 160, 0},
+	{CTRY_PHILIPPINES, FCC3_WORLD, "PH", 40, 160, 0},
+	{CTRY_POLAND, ETSI13_WORLD, "PL", 40, 160, 0},
+	{CTRY_PORTUGAL, ETSI13_WORLD, "PT", 40, 160, 0},
+	{CTRY_PUERTO_RICO, FCC3_FCCA, "PR", 40, 160, 0},
+	{CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0},
+	{CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0},
+	{CTRY_ROMANIA, ETSI13_WORLD, "RO", 40, 160, 0},
+	{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_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},
+	{CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI13_WORLD, "PM", 40, 160, 0},
 	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_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, ETSI13_WORLD, "RS", "RS", 40, 160, 0},
-	{CTRY_SINGAPORE, FCC3_WORLD, "SG", "SG", 40, 160, 0},
-	{CTRY_SLOVAKIA, ETSI13_WORLD, "SK", "SK", 40, 160, 0},
-	{CTRY_SLOVENIA, ETSI13_WORLD, "SI", "SI", 40, 160, 0},
-	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "ZA", 40, 160, 0},
-	{CTRY_SPAIN, ETSI13_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, ETSI13_WORLD, "SE", "SE", 40, 160, 0},
-	{CTRY_SWITZERLAND, ETSI13_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, ETSI13_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, ETSI13_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},
-	{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},
-	{CTRY_XA, MKK5_MKKA, "XA", "XA", 40, 160, 0},
+	 40, 160, 0},
+	{CTRY_SAMOA, ETSI1_WORLD, "WS", 40, 40, 0},
+	{CTRY_SAUDI_ARABIA, ETSI1_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_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_SWEDEN, ETSI13_WORLD, "SE", 40, 160, 0},
+	{CTRY_SWITZERLAND, ETSI13_WORLD, "CH", 40, 160, 0},
+	{CTRY_TAIWAN, FCC3_FCCA, "TW", 40, 160, 0},
+	{CTRY_TANZANIA, APL1_WORLD, "TZ", 40, 160, 0},
+	{CTRY_THAILAND, FCC3_WORLD, "TH", 40, 160, 0},
+	{CTRY_TOGO, ETSI1_WORLD, "TG", 40, 40, 0},
+	{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", 40, 160, 0},
+	{CTRY_TUNISIA, ETSI3_WORLD, "TN", 40, 160, 0},
+	{CTRY_TURKEY, ETSI13_WORLD, "TR", 40, 160, 0},
+	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", 40, 160, 0},
+	{CTRY_UGANDA, FCC3_WORLD, "UG", 40, 160, 0},
+	{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_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_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},
+	{CTRY_JAPAN, MKK5_MKKC, "JP", 40, 160, 0},
+	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
 };
 #endif
 
@@ -667,6 +656,7 @@ enum reg_domains_5g {
 	ETSI11,
 	ETSI12,
 	ETSI13,
+	ETSI14,
 	APL1,
 	APL2,
 	APL4,
@@ -723,6 +713,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{ETSI11_WORLD, ETSI11, WORLD},
 	{ETSI12_WORLD, ETSI12, WORLD},
 	{ETSI13_WORLD, ETSI13, WORLD},
+	{ETSI14_WORLD, ETSI14, WORLD},
 
 	{APL1_WORLD, APL1, WORLD},
 	{APL1_ETSIC, APL1, ETSIC},
@@ -838,16 +829,20 @@ enum reg_rules_5g {
 	CHAN_5250_5330_11,
 	CHAN_5250_5330_12,
 	CHAN_5250_5330_13,
+	CHAN_5250_5330_14,
 	CHAN_5490_5730_1,
 	CHAN_5490_5730_2,
 	CHAN_5490_5730_3,
 	CHAN_5490_5730_4,
 	CHAN_5490_5730_5,
 	CHAN_5490_5730_6,
+	CHAN_5490_5730_7,
 	CHAN_5490_5710_1,
 	CHAN_5490_5710_2,
 	CHAN_5490_5710_3,
 	CHAN_5490_5710_4,
+	CHAN_5490_5710_5,
+	CHAN_5490_5710_6,
 	CHAN_5490_5590_1,
 	CHAN_5490_5590_2,
 	CHAN_5490_5590_3,
@@ -870,6 +865,7 @@ enum reg_rules_5g {
 	CHAN_5735_5875_2,
 	CHAN_5735_5875_3,
 	CHAN_5735_5875_4,
+	CHAN_5735_5875_5,
 	CHAN_5735_5815_1,
 	CHAN_5735_5775_1,
 	CHAN_5835_5855_1,
@@ -906,16 +902,20 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5250_5330_12] = {5250, 5330, 80, 23, REGULATORY_CHAN_RADAR |
 						   REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5250_5330_13] = {5250, 5330, 40, 30, REGULATORY_CHAN_RADAR},
+	[CHAN_5250_5330_14] = {5250, 5330, 80, 26, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5730_1] = {5490, 5730, 160, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5730_2] = {5490, 5730, 160, 20, REGULATORY_CHAN_NO_IR},
 	[CHAN_5490_5730_3] = {5490, 5730, 160, 30, 0},
 	[CHAN_5490_5730_4] = {5490, 5730, 160, 24, 0},
 	[CHAN_5490_5730_5] = {5490, 5730, 160, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5730_6] = {5490, 5730, 160, 23, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5730_7] = {5490, 5730, 160, 20, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_1] = {5490, 5710, 160, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_2] = {5490, 5710, 160, 20, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_3] = {5490, 5710, 160, 27, REGULATORY_CHAN_RADAR},
-	[CHAN_5490_5710_4] = {5490, 5710, 40, 30, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5710_4] = {5490, 5710,  40, 30, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5710_5] = {5490, 5710, 160, 24, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5710_6] = {5490, 5710, 160, 26, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5590_1] = {5490, 5590, 80, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5590_2] = {5490, 5590, 80, 30, 0},
 	[CHAN_5490_5590_3] = {5490, 5590, 80, 36, 0},
@@ -938,6 +938,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5875_2] = {5735, 5875, 20, 30, 0},
 	[CHAN_5735_5875_3] = {5735, 5875, 80, 30, 0},
 	[CHAN_5735_5875_4] = {5735, 5875, 80, 14, 0},
+	[CHAN_5735_5875_5] = {5735, 5875, 80, 20, 0},
 	[CHAN_5735_5815_1] = {5735, 5815, 80, 30, 0},
 	[CHAN_5735_5775_1] = {5735, 5775, 40, 23, 0},
 	[CHAN_5835_5855_1] = {5835, 5855, 20, 30, 0},
@@ -986,9 +987,10 @@ const struct regdomain regdomains_5g[] = {
 					      CHAN_5490_5730_4,
 					      CHAN_5735_5835_2} },
 
-	[FCC14] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_2,
-					      CHAN_5250_5330_6,
-					      CHAN_5735_5835_7} },
+	[FCC14] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 4, {CHAN_5170_5250_4,
+					      CHAN_5250_5330_10,
+					      CHAN_5490_5730_4,
+					      CHAN_5735_5835_2} },
 
 	[ETSI1] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_2,
 						 CHAN_5250_5330_1,
@@ -1005,10 +1007,10 @@ const struct regdomain regdomains_5g[] = {
 						  CHAN_5490_5730_3,
 						  CHAN_5735_5835_2} },
 
-	[ETSI9] = {CTL_ETSI, DFS_ETSI_REG, 20, 0, 4, {CHAN_5170_5250_3,
-						  CHAN_5250_5330_2,
-						  CHAN_5490_5670_1,
-						  CHAN_5735_5835_3} },
+	[ETSI9] = {CTL_ETSI, DFS_ETSI_REG, 20, 0, 4, {CHAN_5170_5250_2,
+						  CHAN_5250_5330_1,
+						  CHAN_5490_5710_5,
+						  CHAN_5735_5835_6} },
 
 	[ETSI11] = {CTL_ETSI, DFS_ETSI_REG, 10, 0, 4, {CHAN_5170_5250_3,
 						  CHAN_5250_5330_2,
@@ -1025,6 +1027,11 @@ const struct regdomain regdomains_5g[] = {
 						  CHAN_5490_5730_5,
 						  CHAN_5735_5875_4} },
 
+	[ETSI14] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_2,
+						  CHAN_5250_5330_1,
+						  CHAN_5490_5730_7,
+						  CHAN_5735_5875_5} },
+
 	[APL1] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5835_2} },
 
 	[APL2] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5815_1} },
@@ -1040,8 +1047,8 @@ const struct regdomain regdomains_5g[] = {
 						CHAN_5735_5835_2} },
 
 	[APL9] = {CTL_ETSI, DFS_KR_REG, 2, 6, 4, {CHAN_5170_5250_3,
-					      CHAN_5250_5330_2,
-					      CHAN_5490_5730_5,
+					      CHAN_5250_5330_1,
+					      CHAN_5490_5710_1,
 					      CHAN_5735_5835_2} },
 
 	[APL10] = {CTL_ETSI, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_2,
@@ -1097,17 +1104,17 @@ const struct regdomain regdomains_5g[] = {
 
 	[MKK3] = {CTL_MKK, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5170_5250_3} },
 
-	[MKK5] = {CTL_MKK, DFS_MKK_REG, 2, 0, 3, {CHAN_5170_5250_3,
-					      CHAN_5250_5330_2,
-					      CHAN_5490_5710_2} },
+	[MKK5] = {CTL_MKK, DFS_MKK_REG, 2, 0, 3, {CHAN_5170_5250_2,
+					      CHAN_5250_5330_14,
+					      CHAN_5490_5710_6} },
 
-	[MKK11] = {CTL_MKK, DFS_MKK_REG, 2, 0, 5, {CHAN_5170_5250_3,
-					       CHAN_5250_5330_2,
-					       CHAN_5490_5710_2,
-					       CHAN_4910_4990_1,
-					       CHAN_5030_5090_1} },
+	[MKK11] = {CTL_MKK, DFS_MKK_REG, 2, 0, 5, {CHAN_4910_4990_1,
+					       CHAN_5170_5250_2,
+					       CHAN_5030_5090_1,
+					       CHAN_5250_5330_14,
+					       CHAN_5490_5710_6} },
 
-	[MKK16] = {CTL_MKK, DFS_MKK_REG, 2, 0, 1, {CHAN_5490_5710_2} },
+	[MKK16] = {CTL_MKK, DFS_MKK_REG, 2, 0, 1, {CHAN_5490_5710_6} },
 
 	[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5330_1,
 						       CHAN_5735_5835_5} },

umac/regulatory/core/src/reg_db.h

@@ -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
@@ -104,8 +104,7 @@ struct regdomain   {
  * struct country_code_to_reg_domain
  * @country_code: country code
  * @reg_dmn_pair_id: reg domainpair id
- * @alpha2: internal alpha2(unique)
- * @alpha2_11d: iso-3166 alpha2
+ * @alpha2: iso-3166 alpha2
  * @max_bw_2g: maximum 2g bandwidth
  * @max_bw_5g: maximum 5g bandwidth
  * @phymode_bitmap: phymodes not supported
@@ -114,7 +113,6 @@ struct country_code_to_reg_domain   {
 	uint16_t country_code;
 	uint16_t reg_dmn_pair_id;
 	uint8_t alpha2[REG_ALPHA2_LEN + 1];
-	uint8_t alpha2_11d[REG_ALPHA2_LEN + 1];
 	uint16_t max_bw_2g;
 	uint16_t max_bw_5g;
 	uint16_t phymode_bitmap;

umac/regulatory/core/src/reg_db_parser.c

@@ -28,7 +28,7 @@
 #include "reg_priv.h"
 #include "reg_services.h"
 
-QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3])
+QDF_STATUS reg_is_country_code_valid(uint8_t *alpha2)
 {
 	uint16_t i;
 	int num_countries;
@@ -36,9 +36,8 @@ QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3])
 	reg_get_num_countries(&num_countries);
 
 	for (i = 0; i < num_countries; i++) {
-		if ((g_all_countries[i].alpha2[0] == alpha[0]) &&
-				(g_all_countries[i].alpha2[1] == alpha[1]) &&
-				(g_all_countries[i].alpha2[2] == alpha[2]))
+		if ((g_all_countries[i].alpha2[0] == alpha2[0]) &&
+				(g_all_countries[i].alpha2[1] == alpha2[1]))
 			return QDF_STATUS_SUCCESS;
 		else
 			continue;
@@ -88,7 +87,7 @@ QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha,
+QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha2,
 	uint16_t *country_index,
 	uint16_t *regdmn_pair)
 {
@@ -100,8 +99,8 @@ QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha,
 	reg_get_num_reg_dmn_pairs(&num_reg_dmn);
 
 	for (i = 0; i < num_countries; i++) {
-		if ((g_all_countries[i].alpha2_11d[0] == alpha[0]) &&
-			(g_all_countries[i].alpha2_11d[1] == alpha[1]))
+		if ((g_all_countries[i].alpha2[0] == alpha2[0]) &&
+			(g_all_countries[i].alpha2[1] == alpha2[1]))
 			break;
 	}
 
@@ -209,8 +208,8 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair(
 				regdomains_5g[dmn_id_5g].num_reg_rules)) {
 
 		qdf_mem_copy(reg_info->alpha2,
-			g_all_countries[country_index].alpha2_11d,
-			sizeof(g_all_countries[country_index].alpha2_11d));
+			g_all_countries[country_index].alpha2,
+			sizeof(g_all_countries[country_index].alpha2));
 
 		reg_info->ctry_code =
 			g_all_countries[country_index].country_code;

umac/regulatory/core/src/reg_db_parser.h

@@ -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
@@ -31,7 +31,7 @@ extern const struct regdomain regdomains_2g[];
 extern const struct regulatory_rule reg_rules_5g[];
 extern const struct regdomain regdomains_5g[];
 
-QDF_STATUS reg_is_country_code_valid(uint8_t alpha[3]);
+QDF_STATUS reg_is_country_code_valid(uint8_t *alpha2);
 
 QDF_STATUS reg_regrules_assign(uint8_t dmn_id_2g,
 		uint8_t dmn_id_5g,