qcacmn: Implement the Regulatory Update #35

Update the Host regdb with QCA regulatory database version 35:

1) Create FCC17_FCCA, FCC17_World, FCC17_ETSIC (identical to FCC3
   without UNII-4 channels). Change ~50 countries to FCC17 for 5G.
2) Create FCC18_ETSIC (identical to FCC8 without UNII-4 channels).
3) Change Brazil to FCC18_ETSIC.
4) Add new 2 countries: Congo and Congo Democratic Republic.
5) Add FCC UNII-4 Frequencies To World SKUs  (0X69, 0X6A, 0X6C).
6) Add Indoor Flag to FCC3/8/15/16 RD's for U-NII4 band.
7) Change Bolivia and Brunei from FCC8 to FCC17_World.
8) Add 11ax support for Russia & Ukraine.
9) Change Azerbaijan to ETSI8_World.
10) Change ETSI12 Power values inline with ETSI1.
11) Change Morocco to ETSI14.
12) Change Armenia to APL4_World.
13) Change Guatemala 2/5GHz to APL19_ETSIC.

Change-Id: I66ac03e343b8c4b38ac891e14476f3b441d25744
CRs-fixed: 2957816

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 34.
+ * Current implementation conforms to database version 35.
  */
 
 #include <qdf_types.h>
@@ -70,6 +70,8 @@ enum country_code {
 	CTRY_CHINA = 156,
 	CTRY_CHRISTMAS_ISLAND = 162,
 	CTRY_COLOMBIA = 170,
+	CTRY_CONGO = 178,
+	CTRY_CONGO_DEMOCRATIC_REPUBLIC = 180,
 	CTRY_COOK_ISLANDS = 184,
 	CTRY_COSTA_RICA = 188,
 	CTRY_COTE_DIVOIRE = 384,
@@ -256,6 +258,10 @@ enum reg_domain {
 	FCC14_WORLD = 0xD1,
 	FCC15_FCCA = 0xEA,
 	FCC16_FCCA = 0xE8,
+	FCC17_FCCA = 0xE9,
+	FCC17_WORLD = 0xEB,
+	FCC17_ETSIC = 0xEC,
+	FCC18_ETSIC = 0xED,
 
 	ETSI1_WORLD = 0x37,
 	ETSI3_WORLD = 0x36,
@@ -322,57 +328,59 @@ enum reg_domain {
 #ifndef CONFIG_REG_CLIENT
 const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(AFGHANISTAN, ETSI1_WORLD, 0, AF, 40, 160, 0, 0),
-	CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
+	CE(ALAND_ISLANDS, FCC17_WORLD, 0, AX, 40, 160, 0, 0),
 	CE(ALBANIA, ETSI1_WORLD, 0, AL, 40, 160, 0, 0),
 	CE(ALGERIA, APL13_WORLD, 0, DZ, 40, 160, 0, 0),
 	CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 160, 0),
 	CE(ANDORRA, ETSI1_WORLD, 0, AD, 40, 160, 0, 0),
 	CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
-	CE(ANTIGUA_AND_BARBUDA, FCC3_WORLD, 0, AG, 40, 160, 0, 0),
+	CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, 0, AG, 40, 160, 0, 0),
 	CE(ARGENTINA, APL16_ETSIC, 0, AR, 40, 160, 0, 0),
 	CE(ARMENIA, APL4_WORLD, 0, AM, 40, 160, 0, 0),
 	CE(ARUBA, ETSI1_WORLD, 0, AW, 40, 160, 0, 0),
 	CE(AUSTRALIA, FCC6_WORLD, 0, AU, 40, 160, 0, 0),
 	CE(AUSTRIA, ETSI1_WORLD, 0, AT, 40, 160, 0, 0),
-	CE(AZERBAIJAN, ETSI4_WORLD, 0, AZ, 40, 160, 0, 0),
-	CE(BAHAMAS, FCC3_WORLD, 0, BS, 40, 160, 0, 0),
+	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
+	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
 	CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
 	CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
 	CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
 	CE(BELARUS, ETSI1_WORLD, 0, BY, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
 	CE(BELGIUM, ETSI1_WORLD, 0, BE, 40, 160, 0, 0),
 	CE(BELIZE, ETSI8_WORLD, 0, BZ, 40, 160, 0, 0),
-	CE(BERMUDA, FCC3_FCCA, 0, BM, 40, 160, 0, 0),
+	CE(BERMUDA, FCC17_FCCA, 0, BM, 40, 160, 0, 0),
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 40, 160, 0, 0),
-	CE(BOLIVIA, FCC8_WORLD, 0, BO, 40, 160, 0, 0),
+	CE(BOLIVIA, FCC17_WORLD, 0, BO, 40, 160, 0, 0),
 	CE(BOSNIA_HERZ, ETSI1_WORLD, 0, BA, 40, 160, 0, 0),
-	CE(BRAZIL, FCC3_ETSIC, 0, BR, 40, 160, 0, 0),
-	CE(BRUNEI_DARUSSALAM, FCC8_WORLD, 0, BN, 40, 160, 0, 0),
+	CE(BRAZIL, FCC18_ETSIC, 0, BR, 40, 160, 0, 0),
+	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
 	CE(BULGARIA, ETSI1_WORLD, 0, BG, 40, 160, 0, 0),
-	CE(BURKINA_FASO, FCC3_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
 	CE(CAMBODIA, ETSI1_WORLD, 0, KH, 40, 160, 0, 0),
 	CE(CAMEROON, ETSI1_WORLD, 0, CM, 40, 160, 0, 0),
 	CE(CANADA, FCC6_FCCA, 0, CA, 40, 160, 0, 0),
-	CE(CAYMAN_ISLANDS, FCC3_WORLD, 0, KY, 40, 160, 0, 0),
-	CE(CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, 0, CF, 40, 40, 0, 0),
+	CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
+	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC14_WORLD, FCC1_6G_05, CL, 40, 160, 160, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, FCC3_WORLD, 0, CX, 40, 160, 0, 0),
-	CE(COLOMBIA, FCC3_WORLD, 0, CO, 40, 160, 0, 0),
-	CE(COOK_ISLANDS, FCC3_WORLD, 0, CK, 40, 160, 0, 0),
-	CE(COSTA_RICA, FCC3_WORLD, 0, CR, 40, 160, 0, 0),
-	CE(COTE_DIVOIRE, FCC3_WORLD, 0, CI, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, FCC17_WORLD, 0, CX, 40, 160, 0, 0),
+	CE(COLOMBIA, FCC17_WORLD, 0, CO, 40, 160, 0, 0),
+	CE(CONGO, ETSI12_WORLD, 0, CG, 40, 160, 0, 0),
+	CE(CONGO_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, 0, CD, 40, 160, 0, 0),
+	CE(COOK_ISLANDS, FCC17_WORLD, 0, CK, 40, 160, 0, 0),
+	CE(COSTA_RICA, FCC17_WORLD, 0, CR, 40, 160, 0, 0),
+	CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
 	CE(CROATIA, ETSI1_WORLD, 0, HR, 40, 160, 0, 0),
 	CE(CURACAO, APL10_WORLD, 0, CW, 40, 160, 0, 0),
 	CE(CYPRUS, ETSI1_WORLD, 0, CY, 40, 160, 0, 0),
 	CE(CZECH, ETSI1_WORLD, 0, CZ, 40, 160, 0, 0),
 	CE(DENMARK, ETSI1_WORLD, 0, DK, 40, 160, 0, 0),
 	CE(DOMINICA, FCC1_FCCA, 0, DM, 40, 160, 0, 0),
-	CE(DOMINICAN_REPUBLIC, FCC3_FCCA, 0, DO, 40, 160, 0, 0),
-	CE(ECUADOR, FCC3_FCCA, 0, EC, 40, 160, 0, 0),
+	CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
+	CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
 	CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
-	CE(EL_SALVADOR, FCC3_WORLD, 0, SV, 40, 160, 0, 0),
+	CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
 	CE(ESTONIA, ETSI1_WORLD, 0, EE, 40, 160, 0, 0),
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI1_WORLD, 0, FK, 40, 160, 0, 0),
@@ -384,21 +392,21 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI1_WORLD, 0, TF, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI1_WORLD, 0, DE, 40, 160, 0, 0),
-	CE(GHANA, FCC3_WORLD, 0, GH, 40, 160, 0, 0),
+	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
 	CE(GIBRALTAR, ETSI1_WORLD, 0, GI, 40, 160, 0, 0),
 	CE(GREECE, ETSI1_WORLD, 0, GR, 40, 160, 0, 0),
 	CE(GREENLAND, ETSI1_WORLD, 0, GL, 40, 160, 0, 0),
-	CE(GRENADA, FCC3_FCCA, 0, GD, 40, 160, 0, 0),
+	CE(GRENADA, FCC17_FCCA, 0, GD, 40, 160, 0, 0),
 	CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
 	CE(GUAM, FCC3_FCCA, FCC1_6G_01, GU, 40, 160, 160, 0),
-	CE(GUATEMALA, ETSI1_WORLD, APL2_6G_06, GT, 40, 160, 160, 0),
+	CE(GUATEMALA, APL19_ETSIC, APL2_6G_06, GT, 40, 160, 160, 0),
 	CE(GUERNSEY, ETSI1_WORLD, 0, GG, 40, 160, 0, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
-	CE(HAITI, FCC3_FCCA, 0, HT, 40, 160, 0, 0),
+	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
 	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, FCC6_WORLD, 0, HM, 40, 160, 0, 0),
 	CE(HOLY_SEE, ETSI1_WORLD, 0, VA, 40, 160, 0, 0),
-	CE(HONDURAS, FCC3_WORLD, 0, HN, 40, 160, 0, 0),
-	CE(HONG_KONG, FCC3_WORLD, 0, HK, 40, 160, 0, 0),
+	CE(HONDURAS, FCC17_WORLD, 0, HN, 40, 160, 0, 0),
+	CE(HONG_KONG, FCC17_WORLD, 0, HK, 40, 160, 0, 0),
 	CE(HUNGARY, ETSI1_WORLD, 0, HU, 40, 160, 0, 0),
 	CE(ICELAND, ETSI1_WORLD, 0, IS, 40, 160, 0, 0),
 	CE(INDIA, APL19_ETSIC, 0, IN, 40, 160, 0, 0),
@@ -418,60 +426,60 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI1_WORLD, 0, KW, 40, 160, 0, 0),
 	CE(LATVIA, ETSI1_WORLD, 0, LV, 40, 160, 0, 0),
-	CE(LEBANON, FCC3_WORLD, 0, LB, 40, 160, 0, 0),
+	CE(LEBANON, FCC17_WORLD, 0, LB, 40, 160, 0, 0),
 	CE(LESOTHO, ETSI1_WORLD, 0, LS, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI1_WORLD, 0, LI, 40, 160, 0, 0),
 	CE(LITHUANIA, ETSI1_WORLD, 0, LT, 40, 160, 0, 0),
 	CE(LUXEMBOURG, ETSI1_WORLD, 0, LU, 40, 160, 0, 0),
-	CE(MACAU, FCC3_WORLD, 0, MO, 40, 160, 0, 0),
+	CE(MACAU, FCC17_WORLD, 0, MO, 40, 160, 0, 0),
 	CE(MACEDONIA, ETSI1_WORLD, 0, MK, 40, 160, 0, 0),
 	CE(MALAWI, ETSI1_WORLD, 0, MW, 40, 160, 0, 0),
 	CE(MALAYSIA, FCC11_WORLD, 0, MY, 40, 160, 0, 0),
 	CE(MALDIVES, APL6_WORLD, 0, MV, 40, 160, 0, 0),
 	CE(MALTA, ETSI1_WORLD, 0, MT, 40, 160, 0, 0),
-	CE(MARSHALL_ISLANDS, FCC3_FCCA, 0, MH, 40, 160, 0, 0),
+	CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
 	CE(MARTINIQUE, ETSI1_WORLD, 0, MQ, 40, 160, 0, 0),
 	CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
 	CE(MAURITIUS, ETSI1_WORLD, 0, MU, 40, 160, 0, 0),
 	CE(MAYOTTE, ETSI1_WORLD, 0, YT, 40, 160, 0, 0),
-	CE(MEXICO, FCC3_ETSIC, 0, MX, 40, 160, 0, 0),
-	CE(MICRONESIA, FCC3_FCCA, 0, FM, 40, 160, 0, 0),
+	CE(MEXICO, FCC17_ETSIC, 0, MX, 40, 160, 0, 0),
+	CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
 	CE(MOLDOVA, ETSI1_WORLD, 0, MD, 40, 160, 0, 0),
 	CE(MONACO, ETSI1_WORLD, 0, MC, 40, 160, 0, 0),
-	CE(MONGOLIA, FCC3_WORLD, 0, MN, 40, 160, 0, 0),
+	CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
 	CE(MONTENEGRO, ETSI1_WORLD, 0, ME, 40, 160, 0, 0),
 	CE(MONTSERRAT, ETSI1_WORLD, 0, MS, 40, 160, 0, 0),
-	CE(MOROCCO, ETSI3_WORLD, 0, MA, 40, 160, 0, 0),
+	CE(MOROCCO, ETSI14_WORLD, 0, MA, 40, 160, 0, 0),
 	CE(MYANMAR, APL1_WORLD, 0, MM, 40, 160, 0, 0),
 	CE(NAMIBIA, APL20_WORLD, 0, NA, 40, 160, 0, 0),
 	CE(NEPAL, APL23_WORLD, 0, NP, 40, 160, 0, 0),
 	CE(NETHERLANDS, ETSI1_WORLD, 0, NL, 40, 160, 0, 0),
 	CE(NETHERLANDS_ANTILLES, ETSI1_WORLD, 0, AN, 40, 160, 0, 0),
 	CE(NEW_CALEDONIA, ETSI1_WORLD, 0, NC, 40, 160, 0, 0),
-	CE(NEW_ZEALAND, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
+	CE(NEW_ZEALAND, FCC17_ETSIC, 0, NZ, 40, 160, 0, 0),
 	CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
 	CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, FCC1_6G_01, MP, 40, 160, 160,
 	   0),
-	CE(NICARAGUA, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
+	CE(NICARAGUA, FCC17_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, ETSI1_WORLD, 0, NU, 40, 160, 0, 0),
 	CE(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
 	CE(NORWAY, ETSI1_WORLD, 0, NO, 40, 160, 0, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
-	CE(PALAU, FCC3_FCCA, 0, PW, 40, 160, 0, 0),
+	CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
 	CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
-	CE(PAPUA_NEW_GUINEA, FCC3_WORLD, 0, PG, 40, 160, 0, 0),
-	CE(PARAGUAY, FCC3_WORLD, 0, PY, 40, 160, 0, 0),
-	CE(PERU, FCC3_WORLD, 0, PE, 40, 160, 0, 0),
-	CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
+	CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
+	CE(PARAGUAY, FCC17_WORLD, 0, PY, 40, 160, 0, 0),
+	CE(PERU, FCC17_WORLD, 0, PE, 40, 160, 0, 0),
+	CE(PHILIPPINES, FCC17_WORLD, 0, PH, 40, 160, 0, 0),
 	CE(POLAND, ETSI1_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI1_WORLD, 0, PT, 40, 160, 0, 0),
 	CE(PUERTO_RICO, FCC3_FCCA, FCC1_6G_01, PR, 40, 160, 160, 0),
 	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
 	CE(REUNION, ETSI1_WORLD, 0, RE, 40, 160, 0, 0),
 	CE(ROMANIA, ETSI1_WORLD, 0, RO, 40, 160, 0, 0),
-	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
-	CE(RWANDA, FCC3_WORLD, 0, RW, 40, 160, 0, 0),
+	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, 0),
+	CE(RWANDA, FCC17_WORLD, 0, RW, 40, 160, 0, 0),
 	CE(SAINT_BARTHELEMY, ETSI1_WORLD, 0, BL, 40, 160, 0, 0),
 	CE(SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI1_WORLD, 0, SH,
 	   40, 160, 0, 0),
@@ -483,31 +491,31 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   40, 160, 0, 0),
 	CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
 	CE(SAN_MARINO, ETSI1_WORLD, 0, SM, 40, 160, 0, 0),
-	CE(SAO_TOME_AND_PRINCIPE, FCC3_WORLD, 0, ST, 40, 160, 0, 0),
+	CE(SAO_TOME_AND_PRINCIPE, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
 	CE(SAUDI_ARABIA, ETSI15_WORLD, 0, SA, 40, 160, 0, 0),
 	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI1_WORLD, 0, RS, 40, 160, 0, 0),
-	CE(SINGAPORE, FCC3_WORLD, 0, SG, 40, 160, 0, 0),
+	CE(SINGAPORE, FCC17_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI1_WORLD, 0, SX, 40, 160, 0, 0),
 	CE(SLOVAKIA, ETSI1_WORLD, 0, SK, 40, 160, 0, 0),
 	CE(SLOVENIA, ETSI1_WORLD, 0, SI, 40, 160, 0, 0),
-	CE(SOUTH_AFRICA, FCC3_WORLD, 0, ZA, 40, 160, 0, 0),
+	CE(SOUTH_AFRICA, FCC17_WORLD, 0, ZA, 40, 160, 0, 0),
 	CE(SPAIN, ETSI1_WORLD, 0, ES, 40, 160, 0, 0),
 	CE(SURINAME, ETSI1_WORLD, 0, SR, 40, 160, 0, 0),
-	CE(SRI_LANKA, FCC3_ETSIC, 0, LK, 40, 160, 0, 0),
+	CE(SRI_LANKA, FCC17_ETSIC, 0, LK, 40, 160, 0, 0),
 	CE(SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, 0, SJ, 40, 160, 0, 0),
 	CE(SWEDEN, ETSI1_WORLD, 0, SE, 40, 160, 0, 0),
 	CE(SWITZERLAND, ETSI1_WORLD, 0, CH, 40, 160, 0, 0),
-	CE(TAIWAN, FCC3_FCCA, 0, TW, 40, 160, 0, 0),
+	CE(TAIWAN, FCC17_FCCA, 0, TW, 40, 160, 0, 0),
 	CE(TANZANIA, APL1_WORLD, 0, TZ, 40, 160, 0, 0),
-	CE(THAILAND, FCC3_WORLD, 0, TH, 40, 160, 0, 0),
+	CE(THAILAND, FCC17_WORLD, 0, TH, 40, 160, 0, 0),
 	CE(TOGO, ETSI1_WORLD, 0, TG, 40, 40, 0, 0),
-	CE(TRINIDAD_Y_TOBAGO, FCC3_WORLD, 0, TT, 40, 160, 0, 0),
+	CE(TRINIDAD_Y_TOBAGO, FCC17_WORLD, 0, TT, 40, 160, 0, 0),
 	CE(TUNISIA, ETSI3_WORLD, 0, TN, 40, 160, 0, 0),
 	CE(TURKEY, ETSI1_WORLD, 0, TR, 40, 160, 0, 0),
-	CE(TURKS_AND_CAICOS, FCC3_WORLD, 0, TC, 40, 160, 0, 0),
-	CE(UGANDA, FCC3_WORLD, 0, UG, 40, 160, 0, 0),
-	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
+	CE(TURKS_AND_CAICOS, FCC17_WORLD, 0, TC, 40, 160, 0, 0),
+	CE(UGANDA, FCC17_WORLD, 0, UG, 40, 160, 0, 0),
+	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, 0),
 	CE(UAE, ETSI13_WORLD, 0, AE, 40, 160, 0, 0),
 	CE(UNITED_KINGDOM, ETSI1_WORLD, ETSI2_6G_03, GB, 40, 160, 160, 0),
 	CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
@@ -515,9 +523,9 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   160, 160, 0),
 	CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 40, 160, 0, 0),
-	CE(VANUATU, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
+	CE(VANUATU, FCC17_WORLD, 0, VU, 40, 160, 0, 0),
 	CE(VENEZUELA, FCC2_ETSIC, 0, VE, 40, 160, 0, 0),
-	CE(VIET_NAM, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
+	CE(VIET_NAM, FCC17_WORLD, 0, VN, 40, 80, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC3_FCCA, FCC1_6G_01, VI, 40, 160, 160, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI1_WORLD, 0, VG, 40, 160, 0, 0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
@@ -528,7 +536,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 #ifdef WLAN_FEATURE_DSRC
 const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(AFGHANISTAN, ETSI1_WORLD, 0, AF, 40, 160, 0, 0),
-	CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
+	CE(ALAND_ISLANDS, FCC17_WORLD, 0, AX, 40, 160, 0, 0),
 	CE(ALBANIA, ETSI13_WORLD, 0, AL, 40, 160, 0, 0),
 	CE(ALGERIA, APL13_WORLD, 0, DZ, 40, 160, 0, 0),
 	CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 160, 0),
@@ -536,49 +544,51 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
 	CE(ANTIGUA_AND_BARBUDA, ETSI10_WORLD, 0, AG, 40, 160, 0, 0),
 	CE(ARGENTINA, APL17_ETSIC, 0, AR, 40, 160, 0, 0),
-	CE(ARMENIA, ETSI4_WORLD, 0, AM, 40, 160, 0, 0),
+	CE(ARMENIA, APL4_WORLD, 0, AM, 40, 160, 0, 0),
 	CE(ARUBA, ETSI1_WORLD, 0, AW, 40, 160, 0, 0),
 	CE(AUSTRALIA, FCC6_WORLD, 0, AU, 40, 160, 0, 0),
 	CE(AUSTRIA, ETSI10_WORLD, 0, AT, 40, 160, 0, 0),
-	CE(AZERBAIJAN, ETSI4_WORLD, 0, AZ, 40, 160, 0, 0),
-	CE(BAHAMAS, FCC3_WORLD, 0, BS, 40, 160, 0, 0),
+	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
+	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
 	CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
 	CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
 	CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
 	CE(BELARUS, ETSI1_WORLD, 0, BY, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
 	CE(BELGIUM, ETSI10_WORLD, 0, BE, 40, 160, 0, 0),
 	CE(BELIZE, ETSI8_WORLD, 0, BZ, 40, 160, 0, 0),
-	CE(BERMUDA, FCC3_FCCA, 0, BM, 40, 160, 0, 0),
+	CE(BERMUDA, FCC17_FCCA, 0, BM, 40, 160, 0, 0),
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 40, 160, 0, 0),
-	CE(BOLIVIA, FCC3_WORLD, 0, BO, 40, 160, 0, 0),
+	CE(BOLIVIA, FCC17_WORLD, 0, BO, 40, 160, 0, 0),
 	CE(BOSNIA_HERZ, ETSI13_WORLD, 0, BA, 40, 160, 0, 0),
-	CE(BRAZIL, FCC3_ETSIC, 0, BR, 40, 160, 0, 0),
-	CE(BRUNEI_DARUSSALAM, FCC3_WORLD, 0, BN, 40, 160, 0, 0),
+	CE(BRAZIL, FCC18_ETSIC, 0, BR, 40, 160, 0, 0),
+	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
 	CE(BULGARIA, ETSI10_WORLD, 0, BG, 40, 160, 0, 0),
-	CE(BURKINA_FASO, FCC3_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
 	CE(CAMBODIA, ETSI1_WORLD, 0, KH, 40, 160, 0, 0),
 	CE(CAMEROON, ETSI1_WORLD, 0, CM, 40, 160, 0, 0),
 	CE(CANADA, FCC3_FCCA, 0, CA, 40, 160, 0, 0),
-	CE(CAYMAN_ISLANDS, FCC3_WORLD, 0, KY, 40, 160, 0, 0),
-	CE(CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, 0, CF, 40, 40, 0, 0),
+	CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
+	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC14_WORLD, FCC1_6G_05, CL, 40, 160, 160, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, FCC3_WORLD, 0, CX, 40, 160, 0, 0),
-	CE(COLOMBIA, FCC3_WORLD, 0, CO, 40, 160, 0, 0),
-	CE(COOK_ISLANDS, FCC3_WORLD, 0, CK, 40, 160, 0, 0),
-	CE(COSTA_RICA, FCC3_WORLD, 0, CR, 40, 160, 0, 0),
-	CE(COTE_DIVOIRE, FCC3_WORLD, 0, CI, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, FCC17_WORLD, 0, CX, 40, 160, 0, 0),
+	CE(COLOMBIA, FCC17_WORLD, 0, CO, 40, 160, 0, 0),
+	CE(CONGO, ETSI12_WORLD, 0, CG, 40, 160, 0, 0),
+	CE(CONGO_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, 0, CD, 40, 160, 0, 0),
+	CE(COOK_ISLANDS, FCC17_WORLD, 0, CK, 40, 160, 0, 0),
+	CE(COSTA_RICA, FCC17_WORLD, 0, CR, 40, 160, 0, 0),
+	CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
 	CE(CROATIA, ETSI10_WORLD, 0, HR, 40, 160, 0, 0),
 	CE(CURACAO, APL10_WORLD, 0, CW, 40, 160, 0, 0),
 	CE(CYPRUS, ETSI10_WORLD, 0, CY, 40, 160, 0, 0),
 	CE(CZECH, ETSI10_WORLD, 0, CZ, 40, 160, 0, 0),
 	CE(DENMARK, ETSI10_WORLD, 0, DK, 40, 160, 0, 0),
 	CE(DOMINICA, FCC2_FCCA, 0, DM, 40, 160, 0, 0),
-	CE(DOMINICAN_REPUBLIC, FCC3_FCCA, 0, DO, 40, 160, 0, 0),
-	CE(ECUADOR, FCC3_FCCA, 0, EC, 40, 160, 0, 0),
+	CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
+	CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
 	CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
-	CE(EL_SALVADOR, FCC3_WORLD, 0, SV, 40, 160, 0, 0),
+	CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
 	CE(ESTONIA, ETSI10_WORLD, 0, EE, 40, 160, 0, 0),
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI10_WORLD, 0, FK, 40, 160, 0, 0),
@@ -590,21 +600,21 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI10_WORLD, 0, TF, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI10_WORLD, 0, DE, 40, 160, 0, 0),
-	CE(GHANA, FCC3_WORLD, 0, GH, 40, 160, 0, 0),
+	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
 	CE(GIBRALTAR, ETSI10_WORLD, 0, GI, 40, 160, 0, 0),
 	CE(GREECE, ETSI10_WORLD, 0, GR, 40, 160, 0, 0),
 	CE(GREENLAND, ETSI10_WORLD, 0, GL, 40, 160, 0, 0),
-	CE(GRENADA, FCC3_FCCA, 0, GD, 40, 160, 0, 0),
+	CE(GRENADA, FCC17_FCCA, 0, GD, 40, 160, 0, 0),
 	CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
 	CE(GUAM, FCC10_FCCA, FCC1_6G_01, GU, 40, 160, 160, 0),
-	CE(GUATEMALA, ETSI1_WORLD, APL2_6G_06, GT, 40, 160, 160, 0),
+	CE(GUATEMALA, APL19_ETSIC, APL2_6G_06, GT, 40, 160, 160, 0),
 	CE(GUERNSEY, ETSI10_WORLD, 0, GG, 40, 160, 0, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
-	CE(HAITI, FCC3_FCCA, 0, HT, 40, 160, 0, 0),
+	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
 	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, FCC6_WORLD, 0, HM, 40, 160, 0, 0),
 	CE(HOLY_SEE, ETSI10_WORLD, 0, VA, 40, 160, 0, 0),
 	CE(HONDURAS, FCC13_WORLD, 0, HN, 40, 160, 0, 0),
-	CE(HONG_KONG, FCC3_WORLD, 0, HK, 40, 160, 0, 0),
+	CE(HONG_KONG, FCC17_WORLD, 0, HK, 40, 160, 0, 0),
 	CE(HUNGARY, ETSI10_WORLD, 0, HU, 40, 160, 0, 0),
 	CE(ICELAND, ETSI10_WORLD, 0, IS, 40, 160, 0, 0),
 	CE(INDIA, APL15_WORLD, 0, IN, 40, 160, 0, 0),
@@ -625,60 +635,60 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI13_WORLD, 0, KW, 40, 160, 0, 0),
 	CE(LATVIA, ETSI10_WORLD, 0, LV, 40, 160, 0, 0),
-	CE(LEBANON, FCC3_WORLD, 0, LB, 40, 160, 0, 0),
+	CE(LEBANON, FCC17_WORLD, 0, LB, 40, 160, 0, 0),
 	CE(LESOTHO, ETSI1_WORLD, 0, LS, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI10_WORLD, 0, LI, 40, 160, 0, 0),
 	CE(LITHUANIA, ETSI10_WORLD, 0, LT, 40, 160, 0, 0),
 	CE(LUXEMBOURG, ETSI10_WORLD, 0, LU, 40, 160, 0, 0),
-	CE(MACAU, FCC3_WORLD, 0, MO, 40, 160, 0, 0),
+	CE(MACAU, FCC17_WORLD, 0, MO, 40, 160, 0, 0),
 	CE(MACEDONIA, ETSI13_WORLD, 0, MK, 40, 160, 0, 0),
 	CE(MALAWI, ETSI1_WORLD, 0, MW, 40, 160, 0, 0),
 	CE(MALAYSIA, FCC11_WORLD, 0, MY, 40, 160, 0, 0),
 	CE(MALDIVES, APL6_WORLD, 0, MV, 40, 160, 0, 0),
 	CE(MALTA, ETSI10_WORLD, 0, MT, 40, 160, 0, 0),
-	CE(MARSHALL_ISLANDS, FCC3_FCCA, 0, MH, 40, 160, 0, 0),
+	CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
 	CE(MARTINIQUE, ETSI10_WORLD, 0, MQ, 40, 160, 0, 0),
 	CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
 	CE(MAURITIUS, ETSI13_WORLD, 0, MU, 40, 160, 0, 0),
 	CE(MAYOTTE, ETSI1_WORLD, 0, YT, 40, 160, 0, 0),
-	CE(MEXICO, FCC3_ETSIC, 0, MX, 40, 160, 0, 0),
-	CE(MICRONESIA, FCC3_FCCA, 0, FM, 40, 160, 0, 0),
+	CE(MEXICO, FCC17_ETSIC, 0, MX, 40, 160, 0, 0),
+	CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
 	CE(MOLDOVA, ETSI13_WORLD, 0, MD, 40, 160, 0, 0),
 	CE(MONACO, ETSI10_WORLD, 0, MC, 40, 160, 0, 0),
-	CE(MONGOLIA, FCC3_WORLD, 0, MN, 40, 160, 0, 0),
+	CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
 	CE(MONTENEGRO, ETSI10_WORLD, 0, ME, 40, 160, 0, 0),
 	CE(MONTSERRAT, ETSI10_WORLD, 0, MS, 40, 160, 0, 0),
-	CE(MOROCCO, ETSI3_WORLD, 0, MA, 40, 160, 0, 0),
+	CE(MOROCCO, ETSI14_WORLD, 0, MA, 40, 160, 0, 0),
 	CE(MYANMAR, APL1_WORLD, 0, MM, 40, 160, 0, 0),
 	CE(NAMIBIA, APL20_WORLD, 0, NA, 40, 160, 0, 0),
 	CE(NEPAL, APL23_WORLD, 0, NP, 40, 160, 0, 0),
 	CE(NETHERLANDS, ETSI10_WORLD, 0, NL, 40, 160, 0, 0),
 	CE(NETHERLANDS_ANTILLES, ETSI10_WORLD, 0, AN, 40, 160, 0, 0),
 	CE(NEW_CALEDONIA, ETSI10_WORLD, 0, NC, 40, 160, 0, 0),
-	CE(NEW_ZEALAND, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
+	CE(NEW_ZEALAND, FCC17_ETSIC, 0, NZ, 40, 160, 0, 0),
 	CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
 	CE(NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, FCC1_6G_01, MP, 40, 160, 160,
 	   0),
-	CE(NICARAGUA, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
+	CE(NICARAGUA, FCC17_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, ETSI10_WORLD, 0, NU, 40, 160, 0, 0),
 	CE(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
 	CE(NORWAY, ETSI10_WORLD, 0, NO, 40, 160, 0, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
-	CE(PALAU, FCC3_FCCA, 0, PW, 40, 160, 0, 0),
+	CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
 	CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
-	CE(PAPUA_NEW_GUINEA, FCC3_WORLD, 0, PG, 40, 160, 0, 0),
-	CE(PARAGUAY, FCC3_WORLD, 0, PY, 40, 160, 0, 0),
-	CE(PERU, FCC3_WORLD, 0, PE, 40, 160, 0, 0),
-	CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
+	CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
+	CE(PARAGUAY, FCC17_WORLD, 0, PY, 40, 160, 0, 0),
+	CE(PERU, FCC17_WORLD, 0, PE, 40, 160, 0, 0),
+	CE(PHILIPPINES, FCC17_WORLD, 0, PH, 40, 160, 0, 0),
 	CE(POLAND, ETSI10_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI10_WORLD, 0, PT, 40, 160, 0, 0),
 	CE(PUERTO_RICO, FCC10_FCCA, FCC1_6G_01, PR, 40, 160, 160, 0),
 	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
 	CE(REUNION, ETSI1_WORLD, 0, RE, 40, 160, 0, 0),
 	CE(ROMANIA, ETSI10_WORLD, 0, RO, 40, 160, 0, 0),
-	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
-	CE(RWANDA, FCC3_WORLD, 0, RW, 40, 160, 0, 0),
+	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, 0),
+	CE(RWANDA, FCC17_WORLD, 0, RW, 40, 160, 0, 0),
 	CE(SAINT_BARTHELEMY, ETSI1_WORLD, 0, BL, 40, 160, 0, 0),
 	CE(SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI10_WORLD, 0, SH, 40,
 	   160, 0, 0),
@@ -690,31 +700,31 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   40, 160, 0, 0),
 	CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
 	CE(SAN_MARINO, ETSI1_WORLD, 0, SM, 40, 160, 0, 0),
-	CE(SAO_TOME_AND_PRINCIPE, FCC3_WORLD, 0, ST, 40, 160, 0, 0),
+	CE(SAO_TOME_AND_PRINCIPE, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
 	CE(SAUDI_ARABIA, ETSI15_WORLD, 0, SA, 40, 160, 0, 0),
 	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI13_WORLD, 0, RS, 40, 160, 0, 0),
-	CE(SINGAPORE, FCC3_WORLD, 0, SG, 40, 160, 0, 0),
+	CE(SINGAPORE, FCC17_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI10_WORLD, 0, SX, 40, 160, 0, 0),
 	CE(SLOVAKIA, ETSI10_WORLD, 0, SK, 40, 160, 0, 0),
 	CE(SLOVENIA, ETSI10_WORLD, 0, SI, 40, 160, 0, 0),
-	CE(SOUTH_AFRICA, FCC3_WORLD, 0, ZA, 40, 160, 0, 0),
+	CE(SOUTH_AFRICA, FCC17_WORLD, 0, ZA, 40, 160, 0, 0),
 	CE(SPAIN, ETSI10_WORLD, 0, ES, 40, 160, 0, 0),
 	CE(SURINAME, ETSI1_WORLD, 0, SR, 40, 160, 0, 0),
-	CE(SRI_LANKA, FCC3_ETSIC, 0, LK, 40, 160, 0, 0),
+	CE(SRI_LANKA, FCC17_ETSIC, 0, LK, 40, 160, 0, 0),
 	CE(SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, 0, SJ, 40, 160, 0, 0),
 	CE(SWEDEN, ETSI10_WORLD, 0, SE, 40, 160, 0, 0),
 	CE(SWITZERLAND, ETSI10_WORLD, 0, CH, 40, 160, 0, 0),
-	CE(TAIWAN, FCC3_FCCA, 0, TW, 40, 160, 0, 0),
+	CE(TAIWAN, FCC17_FCCA, 0, TW, 40, 160, 0, 0),
 	CE(TANZANIA, APL1_WORLD, 0, TZ, 40, 160, 0, 0),
-	CE(THAILAND, FCC3_WORLD, 0, TH, 40, 160, 0, 0),
+	CE(THAILAND, FCC17_WORLD, 0, TH, 40, 160, 0, 0),
 	CE(TOGO, ETSI1_WORLD, 0, TG, 40, 40, 0, 0),
-	CE(TRINIDAD_Y_TOBAGO, FCC3_WORLD, 0, TT, 40, 160, 0, 0),
+	CE(TRINIDAD_Y_TOBAGO, FCC17_WORLD, 0, TT, 40, 160, 0, 0),
 	CE(TUNISIA, ETSI3_WORLD, 0, TN, 40, 160, 0, 0),
 	CE(TURKEY, ETSI13_WORLD, 0, TR, 40, 160, 0, 0),
-	CE(TURKS_AND_CAICOS, FCC3_WORLD, 0, TC, 40, 160, 0, 0),
-	CE(UGANDA, FCC3_WORLD, 0, UG, 40, 160, 0, 0),
-	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
+	CE(TURKS_AND_CAICOS, FCC17_WORLD, 0, TC, 40, 160, 0, 0),
+	CE(UGANDA, FCC17_WORLD, 0, UG, 40, 160, 0, 0),
+	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, 0),
 	CE(UAE, FCC3_WORLD, 0, AE, 40, 160, 0, 0),
 	CE(UNITED_KINGDOM, ETSI10_WORLD, ETSI2_6G_03, GB, 40, 160, 160, 0),
 	CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
@@ -722,9 +732,9 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   40, 160, 160, 0),
 	CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 40, 160, 0, 0),
-	CE(VANUATU, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
+	CE(VANUATU, FCC17_WORLD, 0, VU, 40, 160, 0, 0),
 	CE(VENEZUELA, FCC2_ETSIC, 0, VE, 40, 160, 0, 0),
-	CE(VIET_NAM, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
+	CE(VIET_NAM, FCC17_WORLD, 0, VN, 40, 80, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC10_FCCA, FCC1_6G_01, VI, 40, 160, 160, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, 0, VG, 40, 160, 0, 0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
@@ -734,57 +744,59 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 #else
 const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(AFGHANISTAN, ETSI1_WORLD, 0, AF, 40, 160, 0, 0),
-	CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
+	CE(ALAND_ISLANDS, FCC17_WORLD, 0, AX, 40, 160, 0, 0),
 	CE(ALBANIA, ETSI13_WORLD, 0, AL, 40, 160, 0, 0),
 	CE(ALGERIA, APL13_WORLD, 0, DZ, 40, 160, 0, 0),
 	CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 160, 0),
 	CE(ANDORRA, ETSI13_WORLD, 0, AD, 40, 160, 0, 0),
 	CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
-	CE(ANTIGUA_AND_BARBUDA, FCC3_WORLD, 0, AG, 40, 160, 0, 0),
+	CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, 0, AG, 40, 160, 0, 0),
 	CE(ARGENTINA, APL17_ETSIC, 0, AR, 40, 160, 0, 0),
-	CE(ARMENIA, ETSI4_WORLD, 0, AM, 40, 160, 0, 0),
+	CE(ARMENIA, APL4_WORLD, 0, AM, 40, 160, 0, 0),
 	CE(ARUBA, ETSI1_WORLD, 0, AW, 40, 160, 0, 0),
 	CE(AUSTRALIA, FCC6_WORLD, 0, AU, 40, 160, 0, 0),
 	CE(AUSTRIA, ETSI13_WORLD, 0, AT, 40, 160, 0, 0),
-	CE(AZERBAIJAN, ETSI4_WORLD, 0, AZ, 40, 160, 0, 0),
-	CE(BAHAMAS, FCC3_WORLD, 0, BS, 40, 160, 0, 0),
+	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
+	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
 	CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
 	CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
 	CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
 	CE(BELARUS, ETSI1_WORLD, 0, BY, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
 	CE(BELGIUM, ETSI13_WORLD, 0, BE, 40, 160, 0, 0),
 	CE(BELIZE, ETSI8_WORLD, 0, BZ, 40, 160, 0, 0),
-	CE(BERMUDA, FCC3_FCCA, 0, BM, 40, 160, 0, 0),
+	CE(BERMUDA, FCC17_FCCA, 0, BM, 40, 160, 0, 0),
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 40, 160, 0, 0),
-	CE(BOLIVIA, FCC3_WORLD, 0, BO, 40, 160, 0, 0),
+	CE(BOLIVIA, FCC17_WORLD, 0, BO, 40, 160, 0, 0),
 	CE(BOSNIA_HERZ, ETSI13_WORLD, 0, BA, 40, 160, 0, 0),
-	CE(BRAZIL, FCC3_ETSIC, 0, BR, 40, 160, 0, 0),
-	CE(BRUNEI_DARUSSALAM, FCC3_WORLD, 0, BN, 40, 160, 0, 0),
+	CE(BRAZIL, FCC18_ETSIC, 0, BR, 40, 160, 0, 0),
+	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
 	CE(BULGARIA, ETSI13_WORLD, 0, BG, 40, 160, 0, 0),
-	CE(BURKINA_FASO, FCC3_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
 	CE(CAMBODIA, ETSI1_WORLD, 0, KH, 40, 160, 0, 0),
 	CE(CAMEROON, ETSI1_WORLD, 0, CM, 40, 160, 0, 0),
 	CE(CANADA, FCC6_FCCA, 0, CA, 40, 160, 0, 0),
-	CE(CAYMAN_ISLANDS, FCC3_WORLD, 0, KY, 40, 160, 0, 0),
-	CE(CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, 0, CF, 40, 40, 0, 0),
+	CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
+	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC14_WORLD, FCC1_6G_05, CL, 40, 160, 160, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, FCC3_WORLD, 0, CX, 40, 160, 0, 0),
-	CE(COLOMBIA, FCC3_WORLD, 0, CO, 40, 160, 0, 0),
-	CE(COOK_ISLANDS, FCC3_WORLD, 0, CK, 40, 160, 0, 0),
-	CE(COSTA_RICA, FCC3_WORLD, 0, CR, 40, 160, 0, 0),
-	CE(COTE_DIVOIRE, FCC3_WORLD, 0, CI, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, FCC17_WORLD, 0, CX, 40, 160, 0, 0),
+	CE(COLOMBIA, FCC17_WORLD, 0, CO, 40, 160, 0, 0),
+	CE(CONGO, ETSI12_WORLD, 0, CG, 40, 160, 0, 0),
+	CE(CONGO_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, 0, CD, 40, 160, 0, 0),
+	CE(COOK_ISLANDS, FCC17_WORLD, 0, CK, 40, 160, 0, 0),
+	CE(COSTA_RICA, FCC17_WORLD, 0, CR, 40, 160, 0, 0),
+	CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
 	CE(CROATIA, ETSI13_WORLD, 0, HR, 40, 160, 0, 0),
 	CE(CURACAO, APL10_WORLD, 0, CW, 40, 160, 0, 0),
 	CE(CYPRUS, ETSI13_WORLD, 0, CY, 40, 160, 0, 0),
 	CE(CZECH, ETSI13_WORLD, 0, CZ, 40, 160, 0, 0),
 	CE(DENMARK, ETSI13_WORLD, 0, DK, 40, 160, 0, 0),
 	CE(DOMINICA, FCC2_FCCA, 0, DM, 40, 160, 0, 0),
-	CE(DOMINICAN_REPUBLIC, FCC3_FCCA, 0, DO, 40, 160, 0, 0),
-	CE(ECUADOR, FCC3_FCCA, 0, EC, 40, 160, 0, 0),
+	CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
+	CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
 	CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
-	CE(EL_SALVADOR, FCC3_WORLD, 0, SV, 40, 160, 0, 0),
+	CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
 	CE(ESTONIA, ETSI13_WORLD, 0, EE, 40, 160, 0, 0),
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI13_WORLD, 0, FK, 40, 160, 0, 0),
@@ -796,21 +808,21 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI13_WORLD, 0, TF, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI13_WORLD, 0, DE, 40, 160, 0, 0),
-	CE(GHANA, FCC3_WORLD, 0, GH, 40, 160, 0, 0),
+	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
 	CE(GIBRALTAR, ETSI1_WORLD, 0, GI, 40, 160, 0, 0),
 	CE(GREECE, ETSI13_WORLD, 0, GR, 40, 160, 0, 0),
 	CE(GREENLAND, ETSI1_WORLD, 0, GL, 40, 160, 0, 0),
-	CE(GRENADA, FCC3_FCCA, 0, GD, 40, 160, 0, 0),
+	CE(GRENADA, FCC17_FCCA, 0, GD, 40, 160, 0, 0),
 	CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
 	CE(GUAM, FCC3_FCCA, FCC1_6G_01, GU, 40, 160, 160, 0),
-	CE(GUATEMALA, ETSI1_WORLD, APL2_6G_06, GT, 40, 160, 160, 0),
+	CE(GUATEMALA, APL19_ETSIC, APL2_6G_06, GT, 40, 160, 160, 0),
 	CE(GUERNSEY, ETSI13_WORLD, 0, GG, 40, 160, 0, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
-	CE(HAITI, FCC3_FCCA, 0, HT, 40, 160, 0, 0),
+	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
 	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, FCC6_WORLD, 0, HM, 40, 160, 0, 0),
 	CE(HOLY_SEE, ETSI13_WORLD, 0, VA, 40, 160, 0, 0),
 	CE(HONDURAS, FCC13_WORLD, 0, HN, 40, 160, 0, 0),
-	CE(HONG_KONG, FCC3_WORLD, 0, HK, 40, 160, 0, 0),
+	CE(HONG_KONG, FCC17_WORLD, 0, HK, 40, 160, 0, 0),
 	CE(HUNGARY, ETSI13_WORLD, 0, HU, 40, 160, 0, 0),
 	CE(ICELAND, ETSI13_WORLD, 0, IS, 40, 160, 0, 0),
 	CE(INDIA, APL19_ETSIC, 0, IN, 40, 160, 0, 0),
@@ -831,60 +843,60 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI13_WORLD, 0, KW, 40, 160, 0, 0),
 	CE(LATVIA, ETSI13_WORLD, 0, LV, 40, 160, 0, 0),
-	CE(LEBANON, FCC3_WORLD, 0, LB, 40, 160, 0, 0),
+	CE(LEBANON, FCC17_WORLD, 0, LB, 40, 160, 0, 0),
 	CE(LESOTHO, ETSI1_WORLD, 0, LS, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI13_WORLD, 0, LI, 40, 160, 0, 0),
 	CE(LITHUANIA, ETSI13_WORLD, 0, LT, 40, 160, 0, 0),
 	CE(LUXEMBOURG, ETSI13_WORLD, 0, LU, 40, 160, 0, 0),
-	CE(MACAU, FCC3_WORLD, 0, MO, 40, 160, 0, 0),
+	CE(MACAU, FCC17_WORLD, 0, MO, 40, 160, 0, 0),
 	CE(MACEDONIA, ETSI13_WORLD, 0, MK, 40, 160, 0, 0),
 	CE(MALAWI, ETSI1_WORLD, 0, MW, 40, 160, 0, 0),
 	CE(MALAYSIA, FCC11_WORLD, 0, MY, 40, 160, 0, 0),
 	CE(MALDIVES, APL6_WORLD, 0, MV, 40, 160, 0, 0),
 	CE(MALTA, ETSI13_WORLD, 0, MT, 40, 160, 0, 0),
-	CE(MARSHALL_ISLANDS, FCC3_FCCA, 0, MH, 40, 160, 0, 0),
+	CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
 	CE(MARTINIQUE, ETSI13_WORLD, 0, MQ, 40, 160, 0, 0),
 	CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
 	CE(MAURITIUS, ETSI13_WORLD, 0, MU, 40, 160, 0, 0),
 	CE(MAYOTTE, ETSI1_WORLD, 0, YT, 40, 160, 0, 0),
-	CE(MEXICO, FCC3_ETSIC, 0, MX, 40, 160, 0, 0),
-	CE(MICRONESIA, FCC3_FCCA, 0, FM, 40, 160, 0, 0),
+	CE(MEXICO, FCC17_ETSIC, 0, MX, 40, 160, 0, 0),
+	CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
 	CE(MOLDOVA, ETSI13_WORLD, 0, MD, 40, 160, 0, 0),
 	CE(MONACO, ETSI13_WORLD, 0, MC, 40, 160, 0, 0),
-	CE(MONGOLIA, FCC3_WORLD, 0, MN, 40, 160, 0, 0),
+	CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
 	CE(MONTENEGRO, ETSI13_WORLD, 0, ME, 40, 160, 0, 0),
 	CE(MONTSERRAT, ETSI13_WORLD, 0, MS, 40, 160, 0, 0),
-	CE(MOROCCO, ETSI3_WORLD, 0, MA, 40, 160, 0, 0),
+	CE(MOROCCO, ETSI14_WORLD, 0, MA, 40, 160, 0, 0),
 	CE(MYANMAR, APL1_WORLD, 0, MM, 40, 160, 0, 0),
 	CE(NAMIBIA, APL20_WORLD, 0, NA, 40, 160, 0, 0),
 	CE(NEPAL, APL23_WORLD, 0, NP, 40, 160, 0, 0),
 	CE(NETHERLANDS, ETSI13_WORLD, 0, NL, 40, 160, 0, 0),
 	CE(NETHERLANDS_ANTILLES, ETSI13_WORLD, 0, AN, 40, 160, 0, 0),
 	CE(NEW_CALEDONIA, ETSI13_WORLD, 0, NC, 40, 160, 0, 0),
-	CE(NEW_ZEALAND, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
+	CE(NEW_ZEALAND, FCC17_ETSIC, 0, NZ, 40, 160, 0, 0),
 	CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
 	CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, FCC1_6G_01, MP, 40, 160, 160,
 	   0),
-	CE(NICARAGUA, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
+	CE(NICARAGUA, FCC17_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, ETSI13_WORLD, 0, NU, 40, 160, 0, 0),
 	CE(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
 	CE(NORWAY, ETSI13_WORLD, 0, NO, 40, 160, 0, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
-	CE(PALAU, FCC3_FCCA, 0, PW, 40, 160, 0, 0),
+	CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
 	CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
-	CE(PAPUA_NEW_GUINEA, FCC3_WORLD, 0, PG, 40, 160, 0, 0),
-	CE(PARAGUAY, FCC3_WORLD, 0, PY, 40, 160, 0, 0),
-	CE(PERU, FCC3_WORLD, 0, PE, 40, 160, 0, 0),
-	CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
+	CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
+	CE(PARAGUAY, FCC17_WORLD, 0, PY, 40, 160, 0, 0),
+	CE(PERU, FCC17_WORLD, 0, PE, 40, 160, 0, 0),
+	CE(PHILIPPINES, FCC17_WORLD, 0, PH, 40, 160, 0, 0),
 	CE(POLAND, ETSI13_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI13_WORLD, 0, PT, 40, 160, 0, 0),
 	CE(PUERTO_RICO, FCC3_FCCA, FCC1_6G_01, PR, 40, 160, 160, 0),
 	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
 	CE(REUNION, ETSI1_WORLD, 0, RE, 40, 160, 0, 0),
 	CE(ROMANIA, ETSI13_WORLD, 0, RO, 40, 160, 0, 0),
-	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
-	CE(RWANDA, FCC3_WORLD, 0, RW, 40, 160, 0, 0),
+	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, 0),
+	CE(RWANDA, FCC17_WORLD, 0, RW, 40, 160, 0, 0),
 	CE(SAINT_BARTHELEMY, ETSI1_WORLD, 0, BL, 40, 160, 0, 0),
 	CE(SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI13_WORLD, 0, SH,
 	   40, 160, 0, 0),
@@ -896,31 +908,31 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   40, 160, 0, 0),
 	CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
 	CE(SAN_MARINO, ETSI13_WORLD, 0, SM, 40, 160, 0, 0),
-	CE(SAO_TOME_AND_PRINCIPE, FCC3_WORLD, 0, ST, 40, 160, 0, 0),
+	CE(SAO_TOME_AND_PRINCIPE, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
 	CE(SAUDI_ARABIA, ETSI15_WORLD, 0, SA, 40, 160, 0, 0),
 	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI13_WORLD, 0, RS, 40, 160, 0, 0),
-	CE(SINGAPORE, FCC3_WORLD, 0, SG, 40, 160, 0, 0),
+	CE(SINGAPORE, FCC17_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI13_WORLD, 0, SX, 40, 160, 0, 0),
 	CE(SLOVAKIA, ETSI13_WORLD, 0, SK, 40, 160, 0, 0),
 	CE(SLOVENIA, ETSI13_WORLD, 0, SI, 40, 160, 0, 0),
-	CE(SOUTH_AFRICA, FCC3_WORLD, 0, ZA, 40, 160, 0, 0),
+	CE(SOUTH_AFRICA, FCC17_WORLD, 0, ZA, 40, 160, 0, 0),
 	CE(SPAIN, ETSI13_WORLD, 0, ES, 40, 160, 0, 0),
 	CE(SURINAME, ETSI1_WORLD, 0, SR, 40, 160, 0, 0),
-	CE(SRI_LANKA, FCC3_ETSIC, 0, LK, 40, 160, 0, 0),
+	CE(SRI_LANKA, FCC17_ETSIC, 0, LK, 40, 160, 0, 0),
 	CE(SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, 0, SJ, 40, 160, 0, 0),
 	CE(SWEDEN, ETSI13_WORLD, 0, SE, 40, 160, 0, 0),
 	CE(SWITZERLAND, ETSI13_WORLD, 0, CH, 40, 160, 0, 0),
-	CE(TAIWAN, FCC3_FCCA, 0, TW, 40, 160, 0, 0),
+	CE(TAIWAN, FCC17_FCCA, 0, TW, 40, 160, 0, 0),
 	CE(TANZANIA, APL1_WORLD, 0, TZ, 40, 160, 0, 0),
-	CE(THAILAND, FCC3_WORLD, 0, TH, 40, 160, 0, 0),
+	CE(THAILAND, FCC17_WORLD, 0, TH, 40, 160, 0, 0),
 	CE(TOGO, ETSI1_WORLD, 0, TG, 40, 40, 0, 0),
-	CE(TRINIDAD_Y_TOBAGO, FCC3_WORLD, 0, TT, 40, 160, 0, 0),
+	CE(TRINIDAD_Y_TOBAGO, FCC17_WORLD, 0, TT, 40, 160, 0, 0),
 	CE(TUNISIA, ETSI3_WORLD, 0, TN, 40, 160, 0, 0),
 	CE(TURKEY, ETSI13_WORLD, 0, TR, 40, 160, 0, 0),
-	CE(TURKS_AND_CAICOS, FCC3_WORLD, 0, TC, 40, 160, 0, 0),
-	CE(UGANDA, FCC3_WORLD, 0, UG, 40, 160, 0, 0),
-	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
+	CE(TURKS_AND_CAICOS, FCC17_WORLD, 0, TC, 40, 160, 0, 0),
+	CE(UGANDA, FCC17_WORLD, 0, UG, 40, 160, 0, 0),
+	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, 0),
 	CE(UAE, ETSI13_WORLD, 0, AE, 40, 160, 0, 0),
 	CE(UNITED_KINGDOM, ETSI13_WORLD, ETSI2_6G_03, GB, 40, 160, 160, 0),
 	CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
@@ -928,9 +940,9 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   160, 160, 0),
 	CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 40, 160, 0, 0),
-	CE(VANUATU, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
+	CE(VANUATU, FCC17_WORLD, 0, VU, 40, 160, 0, 0),
 	CE(VENEZUELA, FCC2_ETSIC, 0, VE, 40, 160, 0, 0),
-	CE(VIET_NAM, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
+	CE(VIET_NAM, FCC17_WORLD, 0, VN, 40, 80, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC3_FCCA, FCC1_6G_01, VI, 40, 160, 160, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI13_WORLD, 0, VG, 40, 160, 0, 0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
@@ -971,6 +983,8 @@ enum reg_domains_5g {
 	FCC14,
 	FCC15,
 	FCC16,
+	FCC17,
+	FCC18,
 	ETSI1,
 	ETSI3,
 	ETSI4,
@@ -1040,6 +1054,10 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{FCC14_WORLD, FCC14, WORLD},
 	{FCC15_FCCA, FCC15, FCCA},
 	{FCC16_FCCA, FCC16, FCCA},
+	{FCC17_FCCA, FCC17, FCCA},
+	{FCC17_WORLD, FCC17, WORLD},
+	{FCC17_ETSIC, FCC17, ETSIC},
+	{FCC18_ETSIC, FCC18, ETSIC},
 
 	{ETSI1_WORLD, ETSI1, WORLD},
 	{ETSI3_WORLD, ETSI3, WORLD},
@@ -1244,7 +1262,7 @@ enum reg_rules_5g {
 	CHAN_5735_5895_2,
 	CHAN_5835_5855_1,
 	CHAN_5835_5855_2,
-	CHAN_5855_5875_1,
+	CHAN_5835_5895_1,
 	CHAN_5850_5925_1,
 	CHAN_5850_5925_2,
 #if defined(CONFIG_BAND_6GHZ) && defined(COMPILE_REGDB_6G)
@@ -1344,7 +1362,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5895_2] = {5735, 5895, 160, 20, REGULATORY_CHAN_NO_IR},
 	[CHAN_5835_5855_1] = {5835, 5855, 20, 30, 0},
 	[CHAN_5835_5855_2] = {5835, 5855, 20, 14, REGULATORY_CHAN_INDOOR_ONLY},
-	[CHAN_5855_5875_1] = {5855, 5875, 20, 30, 0},
+	[CHAN_5835_5895_1] = {5835, 5895, 80, 30, REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5850_5925_1] = {5850, 5925, 20, 24, 0},
 	[CHAN_5850_5925_2] = {5850, 5925, 20, 30, 0},
 #if defined(CONFIG_BAND_6GHZ) && defined(COMPILE_REGDB_6G)
@@ -1364,10 +1382,11 @@ const struct regdomain regdomains_5g[] = {
 							  CHAN_5250_5330_1,
 							  CHAN_5735_5835_2} },
 
-	[FCC3] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_5170_5250_5,
+	[FCC3] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 5, {CHAN_5170_5250_5,
 							  CHAN_5250_5330_7,
 							  CHAN_5490_5730_1,
-							  CHAN_5735_5895_1} },
+							  CHAN_5735_5835_2,
+							  CHAN_5835_5895_1} },
 
 	[FCC4] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_4940_4990_1,
 							  CHAN_5170_5250_1,
@@ -1383,10 +1402,11 @@ const struct regdomain regdomains_5g[] = {
 							  CHAN_5650_5730_1,
 							  CHAN_5735_5835_2} },
 
-	[FCC8] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_5170_5250_4,
+	[FCC8] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 5, {CHAN_5170_5250_4,
 							  CHAN_5250_5330_7,
 							  CHAN_5490_5730_1,
-							  CHAN_5735_5895_1} },
+							  CHAN_5735_5835_2,
+							  CHAN_5835_5895_1} },
 
 	[FCC10] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 5, {CHAN_5170_5250_4,
 							   CHAN_5250_5330_7,
@@ -1412,18 +1432,30 @@ const struct regdomain regdomains_5g[] = {
 							      },
 
 #if defined(CONFIG_BAND_6GHZ) && defined(COMPILE_REGDB_6G)
-	[FCC15] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 5, {CHAN_5170_5250_5,
+	[FCC15] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 6, {CHAN_5170_5250_5,
 							   CHAN_5250_5330_7,
 							   CHAN_5490_5730_1,
-							   CHAN_5735_5895_1,
+							   CHAN_5735_5835_2,
+							   CHAN_5835_5895_1,
 							   CHAN_5945_7125_1} },
 
-	[FCC16] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 5, {CHAN_5170_5250_4,
+	[FCC16] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 6, {CHAN_5170_5250_4,
 							   CHAN_5250_5330_7,
 							   CHAN_5490_5730_1,
-							   CHAN_5735_5895_1,
+							   CHAN_5735_5835_2,
+							   CHAN_5835_5895_1,
 							   CHAN_5945_7125_2} },
 #endif
+	[FCC17] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_5170_5250_5,
+							   CHAN_5250_5330_7,
+							   CHAN_5490_5730_1,
+							   CHAN_5735_5835_2} },
+
+	[FCC18] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_5170_5250_4,
+							   CHAN_5250_5330_7,
+							   CHAN_5490_5730_1,
+							   CHAN_5735_5835_2} },
+
 	[ETSI1] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 3, {CHAN_5170_5250_8,
 							     CHAN_5250_5330_12,
 							     CHAN_5490_5710_1}
@@ -1461,9 +1493,9 @@ const struct regdomain regdomains_5g[] = {
 							      CHAN_5735_5875_1}
 							      },
 
-	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 4, {CHAN_5170_5250_7,
-							      CHAN_5250_5330_14,
-							      CHAN_5490_5730_6,
+	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 4, {CHAN_5170_5250_8,
+							      CHAN_5250_5330_12,
+							      CHAN_5490_5730_5,
 							      CHAN_5735_5835_8}
 							      },
 
@@ -1604,11 +1636,12 @@ const struct regdomain regdomains_5g[] = {
 								    CHAN_5945_7125_3}
 								    },
 
-	[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REGION, 2, 160, 0, 4, {CHAN_5170_5330_1,
-								    CHAN_5490_5730_2,
-								    CHAN_5735_5835_5,
-								    CHAN_5945_7125_3}
-								    },
+	[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REGION, 2, 160, 0, 4,
+							{CHAN_5170_5330_1,
+							 CHAN_5490_5730_2,
+							 CHAN_5735_5895_2,
+							 CHAN_5945_7125_3}
+							},
 #else
 	[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REGION, 2, 160, 0, 2, {CHAN_5170_5330_1,
 								    CHAN_5735_5835_5}