qcacmn: Update Regulatory Database to 40th version

1. Change/Add the following country mapping for all(WIN,Linux Android,DSRC)
i) Add new country "BOTSWANA" and map to ETSI13_WORLD.
ii) Add new country "BURUNDI" and map to ETSI13_WORLD.
iii) Add new country "FIJI" and map to APL1_WORLD.
iv) Add new country "GABON" and map to ETSI3_WORLD.
v) Add new country "LAO PEOPLES DEMOCRATIC REPUBLIC" and map to
ETSI13_WORLD.
vi) Add new country "LIBYA" and map to ETSI12_WORLD.
vii) Add new country "ZAMBIA" and map to ETSI13_WORLD.
viii) Change the mapping of  RWANDA to ETSI13_WORLD.
ix) Change the mapping of SENEGAL to ETSI1_WORLD.
x) Change the mapping of "VIET NAM" to ETSI15_WORLD and remove 160MHz
disable flag
xi) Change the mapping of "SAUDI ARABIA" to ETSI13_WORLD.

2. Change the following country mapping only for Linux Android
i) Change the mapping of "UNITED KINGDOM" to ETSI18_WORLD.

3. Change (or) Add the following country mapping to Regdomain for 6GHz.
i) Create new Full 6GHz reg domain Hex code 0x0C and map Full 6GHz domain
Hex code 0x0C to countries: AUSTRALIA, CHRISTMAS ISLAND,
HEARD ISLAND AND MCDONALD ISLANDS, NORFOLK ISLAND.
iii) Map full 6GHz reg domain Hex code 02 to countries:BULGARIA, HUNGARY,
JORDAN, QATAR.
iii) Map full 6GHz reg domain Hex code 03 to Hong Kong.
iv) Map Full 6GHz Hex code 05 to LAO PEOPLE'S DEMOCRATIC REPUBLIC.

4. Add the following regulatory database for 2.4/5GHz.
i) Add APL14 "indoor flag" to UNII-1 5150-5250MHz and UNII-2a 5250-5350MHz
ii) Updated APL12 per JORDAN new 5GHz band rule and reserve for
customer use.
iii) For ETSI13, update Max. BW from 320MHz to 160MHz and remove straddle
channels CH144(5720MHz), CH142(5710MHz), CH138(5690MHz) and also 5650
Punctured 1111_1111_1111_0000 channel.
iv) Create new 5GHz Regdomain ETSI18(Hex 0x0E44) and Full 2 & 5GHz
Regdomain ETSI18_WORLD(Hex 0x6E).
v) For Israel, remove straddle channels CH144(5720MHz), CH142(5710MHz),
CH138(5690MHz) from ETSI17.

Change-Id: I7fa7f1e9f3e6fcd6aa6ecd5aa21bd4e82aeb19a0
CRs-Fixed: 3209514

umac/regulatory/core/src/reg_db.c

@@ -57,10 +57,12 @@ enum country_code {
 	CTRY_BHUTAN = 64,
 	CTRY_BOLIVIA = 68,
 	CTRY_BOSNIA_HERZ = 70,
+	CTRY_BOTSWANA = 72,
 	CTRY_BRAZIL = 76,
 	CTRY_BRUNEI_DARUSSALAM = 96,
 	CTRY_BULGARIA = 100,
 	CTRY_BURKINA_FASO = 854,
+	CTRY_BURUNDI = 108,
 	CTRY_CAMBODIA = 116,
 	CTRY_CAMEROON = 120,
 	CTRY_CANADA = 124,
@@ -90,11 +92,13 @@ enum country_code {
 	CTRY_ETHIOPIA = 231,
 	CTRY_FALKLAND_ISLANDS = 238,
 	CTRY_FAROE_ISLANDS = 234,
+	CTRY_FIJI = 242,
 	CTRY_FINLAND = 246,
 	CTRY_FRANCE = 250,
 	CTRY_FRENCH_GUIANA = 254,
 	CTRY_FRENCH_POLYNESIA = 258,
 	CTRY_FRENCH_SOUTHERN_TERRITORIES = 260,
+	CTRY_GABON = 266,
 	CTRY_GEORGIA = 268,
 	CTRY_GERMANY = 276,
 	CTRY_GHANA = 288,
@@ -130,9 +134,11 @@ enum country_code {
 	CTRY_KENYA = 404,
 	CTRY_KOREA_ROC = 410,
 	CTRY_KUWAIT = 414,
+	CTRY_LAO_PEOPLES_DEMOCRATIC_REPUBLIC = 418,
 	CTRY_LATVIA = 428,
 	CTRY_LEBANON = 422,
 	CTRY_LESOTHO = 426,
+	CTRY_LIBYA = 434,
 	CTRY_LIECHTENSTEIN = 438,
 	CTRY_LITHUANIA = 440,
 	CTRY_LUXEMBOURG = 442,
@@ -231,6 +237,7 @@ enum country_code {
 	CTRY_WALLIS_AND_FUTUNA = 876,
 	CTRY_XA = 4100,   /* Used by Linux Client for legacy MKK domain */
 	CTRY_YEMEN = 887,
+	CTRY_ZAMBIA = 894,
 	CTRY_ZIMBABWE = 716,
 };
 
@@ -279,6 +286,7 @@ enum reg_domain {
 	ETSI15_ETSIC = 0x7A,
 	ETSI16_WORLD = 0x4A,
 	ETSI17_WORLD = 0x4B,
+	ETSI18_WORLD = 0x6E,
 
 	APL1_WORLD = 0x52,
 	APL1_ETSIC = 0x55,
@@ -344,7 +352,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	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, APL25_ETSIC, 0, AU, 40, 160, 0, 0),
+	CE(AUSTRALIA, APL25_ETSIC, ETSI2_6G_0C, AU, 40, 160, 320, 0),
 	CE(AUSTRIA, ETSI1_WORLD, 0, AT, 40, 160, 0, 0),
 	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
 	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
@@ -358,10 +366,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 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(BOTSWANA, ETSI13_WORLD, 0, BW, 40, 160, 0, 0),
 	CE(BRAZIL, FCC18_ETSIC, FCC1_6G_07, BR, 40, 160, 320, 0),
 	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
-	CE(BULGARIA, ETSI1_WORLD, 0, BG, 40, 160, 0, 0),
+	CE(BULGARIA, ETSI1_WORLD, ETSI1_6G_02, BG, 40, 160, 320, 0),
 	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURUNDI, ETSI13_WORLD, 0, BI, 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, FCC1_6G_05, CA, 40, 160, 320, 0),
@@ -370,7 +380,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, APL25_ETSIC, 0, CX, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 320, 0, 0),
 	CE(COLOMBIA, FCC17_FCCA, 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),
@@ -391,12 +401,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI1_WORLD, ETSI1_6G_02, FK, 40, 160, 320, 0),
 	CE(FAROE_ISLANDS, ETSI1_WORLD, ETSI1_6G_02, FO, 40, 160, 320, 0),
+	CE(FIJI, APL1_WORLD, 0, FJ, 40, 160, 0, 0),
 	CE(FINLAND, ETSI1_WORLD, ETSI1_6G_02, FI, 40, 160, 320, 0),
 	CE(FRANCE, ETSI1_WORLD, ETSI1_6G_02, FR, 40, 160, 320, 0),
 	CE(FRENCH_GUIANA, ETSI1_WORLD, ETSI1_6G_02, GF, 40, 160, 320, 0),
 	CE(FRENCH_POLYNESIA, ETSI1_WORLD, ETSI1_6G_02, PF, 40, 160, 320, 0),
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI1_WORLD, ETSI1_6G_02, TF, 40, 160,
 	   320, 0),
+	CE(GABON, ETSI3_WORLD, 0, GA, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI1_WORLD, ETSI1_6G_02, DE, 40, 160, 320, 0),
 	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
@@ -410,12 +422,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(GUERNSEY, ETSI1_WORLD, ETSI1_6G_02, GG, 40, 160, 320, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
 	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
-	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, 0, HM, 40, 160, 0,
-	   0),
+	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, ETSI2_6G_0C, HM, 40,
+	   160, 320, 0),
 	CE(HOLY_SEE, ETSI1_WORLD, 0, VA, 40, 160, 0, 0),
 	CE(HONDURAS, FCC17_WORLD, FCC1_6G_07, HN, 40, 160, 320, 0),
-	CE(HONG_KONG, APL20_WORLD, 0, HK, 40, 160, 0, 0),
-	CE(HUNGARY, ETSI1_WORLD, 0, HU, 40, 160, 0, 0),
+	CE(HONG_KONG, APL20_WORLD, ETSI2_6G_03, HK, 40, 160, 320, 0),
+	CE(HUNGARY, ETSI1_WORLD, ETSI1_6G_02, HU, 40, 160, 320, 0),
 	CE(ICELAND, ETSI1_WORLD, ETSI1_6G_02, IS, 40, 160, 320, 0),
 	CE(INDIA, APL19_ETSIC, 0, IN, 40, 160, 0, 0),
 	CE(INDONESIA, APL2_ETSID, 0, ID, 40, 80, 0, 0),
@@ -428,14 +440,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(JAPAN, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
 	CE(JAPAN15, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
 	CE(JERSEY, ETSI1_WORLD, ETSI1_6G_02, JE, 40, 160, 320, 0),
-	CE(JORDAN, APL4_WORLD, 0, JO, 40, 160, 0, 0),
+	CE(JORDAN, APL4_WORLD, ETSI1_6G_02, JO, 40, 160, 320, 0),
 	CE(KAZAKHSTAN, MKK5_MKKC, 0, KZ, 40, 160, 0, 0),
 	CE(KENYA, ETSI13_WORLD, 0, KE, 40, 160, 0, 0),
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI1_WORLD, 0, KW, 40, 160, 0, 0),
+	CE(LAO_PEOPLES_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, FCC1_6G_05, LA, 40,
+	   160, 320, 0),
 	CE(LATVIA, ETSI1_WORLD, 0, LV, 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(LIBYA, ETSI12_WORLD, 0, LY, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI1_WORLD, ETSI1_6G_02, LI, 40, 160, 320, 0),
 	CE(LITHUANIA, ETSI1_WORLD, ETSI1_6G_02, LT, 40, 160, 320, 0),
 	CE(LUXEMBOURG, ETSI1_WORLD, 0, LU, 40, 160, 0, 0),
@@ -470,7 +485,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   0),
 	CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, APL26_ETSIC, 0, NU, 40, 160, 0, 0),
-	CE(NORFOLK_ISLAND, APL25_ETSIC, 0, NF, 40, 160, 0, 0),
+	CE(NORFOLK_ISLAND, APL25_ETSIC, ETSI2_6G_0C, NF, 40, 160, 320, 0),
 	CE(NORWAY, ETSI1_WORLD, ETSI1_6G_02, NO, 40, 160, 320, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
@@ -483,11 +498,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(POLAND, ETSI1_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI1_WORLD, ETSI1_6G_02, PT, 40, 160, 320, 0),
 	CE(PUERTO_RICO, FCC3_FCCA, FCC1_6G_01, PR, 40, 160, 320, 0),
-	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
+	CE(QATAR, ETSI14_WORLD, ETSI1_6G_02, QA, 40, 160, 320, 0),
 	CE(REUNION, ETSI1_WORLD, ETSI1_6G_02, RE, 40, 160, 320, 0),
 	CE(ROMANIA, ETSI1_WORLD, 0, RO, 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(RWANDA, ETSI13_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,
 	   ETSI1_6G_02, SH, 40, 160, 320, 0),
@@ -501,8 +516,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	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, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
-	CE(SAUDI_ARABIA, ETSI15_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
-	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
+	CE(SAUDI_ARABIA, ETSI13_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
+	CE(SENEGAL, ETSI1_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI1_WORLD, 0, RS, 40, 160, 0, 0),
 	CE(SINGAPORE, APL20_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI1_WORLD, ETSI1_6G_02, SX, 40, 160, 320, 0),
@@ -535,12 +550,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 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, APL20_WORLD, 0, VN, 40, 80, 0, 0),
+	CE(VIET_NAM, ETSI15_WORLD, 0, VN, 40, 160, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC3_FCCA, FCC1_6G_01, VI, 40, 160, 320, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI1_WORLD, ETSI1_6G_02, VG, 40, 160, 320,
 	   0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
 	CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
+	CE(ZAMBIA, ETSI13_WORLD, 0, ZM, 40, 160, 0, 0),
 	CE(ZIMBABWE, ETSI1_WORLD, 0, ZW, 40, 160, 0, 0),
 };
 #else
@@ -557,7 +573,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ARGENTINA, APL17_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, APL25_ETSIC, 0, AU, 40, 160, 0, 0),
+	CE(AUSTRALIA, APL25_ETSIC, ETSI2_6G_0C, AU, 40, 160, 320, 0),
 	CE(AUSTRIA, ETSI10_WORLD, 0, AT, 40, 160, 0, 0),
 	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
 	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
@@ -571,10 +587,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 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(BOTSWANA, ETSI13_WORLD, 0, BW, 40, 160, 0, 0),
 	CE(BRAZIL, FCC18_ETSIC, FCC1_6G_07, BR, 40, 160, 320, 0),
 	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
-	CE(BULGARIA, ETSI10_WORLD, 0, BG, 40, 160, 0, 0),
+	CE(BULGARIA, ETSI10_WORLD, ETSI1_6G_02, BG, 40, 160, 320, 0),
 	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURUNDI, ETSI13_WORLD, 0, BI, 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, FCC1_6G_05, CA, 40, 160, 320, 0),
@@ -583,7 +601,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, APL25_ETSIC, 0, CX, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 160, 320, 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),
@@ -604,12 +622,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI10_WORLD, ETSI1_6G_02, FK, 40, 160, 320, 0),
 	CE(FAROE_ISLANDS, ETSI10_WORLD, ETSI1_6G_02, FO, 40, 160, 320, 0),
+	CE(FIJI, APL1_WORLD, 0, FJ, 40, 160, 0, 0),
 	CE(FINLAND, ETSI10_WORLD, ETSI1_6G_02, FI, 40, 160, 320, 0),
 	CE(FRANCE, ETSI10_WORLD, ETSI1_6G_02, FR, 40, 160, 320, 0),
 	CE(FRENCH_GUIANA, ETSI10_WORLD, ETSI1_6G_02, GF, 40, 160, 320, 0),
 	CE(FRENCH_POLYNESIA, ETSI10_WORLD, ETSI1_6G_02, PF, 40, 160, 320, 0),
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI10_WORLD, ETSI1_6G_02, TF, 40, 160,
 	   320, 0),
+	CE(GABON, ETSI3_WORLD, 0, GA, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI10_WORLD, ETSI1_6G_02, DE, 40, 160, 320, 0),
 	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
@@ -623,12 +643,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(GUERNSEY, ETSI10_WORLD, ETSI1_6G_02, GG, 40, 160, 320, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
 	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
-	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, 0, HM, 40, 160, 0,
-	   0),
+	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, ETSI2_6G_0C, HM, 40,
+	   160, 320, 0),
 	CE(HOLY_SEE, ETSI10_WORLD, 0, VA, 40, 160, 0, 0),
 	CE(HONDURAS, FCC13_WORLD, FCC1_6G_07, HN, 40, 160, 320, 0),
-	CE(HONG_KONG, APL20_WORLD, 0, HK, 40, 160, 0, 0),
-	CE(HUNGARY, ETSI10_WORLD, 0, HU, 40, 160, 0, 0),
+	CE(HONG_KONG, APL20_WORLD, ETSI2_6G_03, HK, 40, 160, 320, 0),
+	CE(HUNGARY, ETSI10_WORLD, ETSI1_6G_02, HU, 40, 160, 320, 0),
 	CE(ICELAND, ETSI10_WORLD, ETSI1_6G_02, IS, 40, 160, 320, 0),
 	CE(INDIA, APL15_WORLD, 0, IN, 40, 160, 0, 0),
 	CE(INDONESIA, APL2_ETSID, 0, ID, 40, 80, 0, 0),
@@ -642,14 +662,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(JAPAN15, MKK5_MKKC, 0, JP, 40, 160, 0, 0),
 	CE(XA, MKK5_MKKA, 0, XA, 40, 160, 0, 0),
 	CE(JERSEY, ETSI10_WORLD, ETSI1_6G_02, JE, 40, 160, 320, 0),
-	CE(JORDAN, APL4_WORLD, 0, JO, 40, 160, 0, 0),
+	CE(JORDAN, APL4_WORLD, ETSI1_6G_02, JO, 40, 160, 320, 0),
 	CE(KAZAKHSTAN, MKK5_MKKC, 0, KZ, 40, 160, 0, 0),
 	CE(KENYA, ETSI13_WORLD, 0, KE, 40, 160, 0, 0),
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI13_WORLD, 0, KW, 40, 160, 0, 0),
+	CE(LAO_PEOPLES_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, FCC1_6G_05, LA, 40,
+	   160, 320, 0),
 	CE(LATVIA, ETSI10_WORLD, 0, LV, 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(LIBYA, ETSI12_WORLD, 0, LY, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI10_WORLD, ETSI1_6G_02, LI, 40, 160, 320, 0),
 	CE(LITHUANIA, ETSI10_WORLD, ETSI1_6G_02, LT, 40, 160, 320, 0),
 	CE(LUXEMBOURG, ETSI10_WORLD, 0, LU, 40, 160, 0, 0),
@@ -685,7 +708,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   0),
 	CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, ETSI10_WORLD, 0, NU, 40, 160, 0, 0),
-	CE(NORFOLK_ISLAND, APL25_ETSIC, 0, NF, 40, 160, 0, 0),
+	CE(NORFOLK_ISLAND, APL25_ETSIC, ETSI2_6G_0C, NF, 40, 160, 320, 0),
 	CE(NORWAY, ETSI10_WORLD, ETSI1_6G_02, NO, 40, 160, 320, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
@@ -698,11 +721,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(POLAND, ETSI10_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI10_WORLD, ETSI1_6G_02, PT, 40, 160, 320, 0),
 	CE(PUERTO_RICO, FCC10_FCCA, FCC1_6G_01, PR, 40, 160, 320, 0),
-	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
+	CE(QATAR, ETSI14_WORLD, ETSI1_6G_02, QA, 40, 160, 320, 0),
 	CE(REUNION, ETSI1_WORLD, ETSI1_6G_02, RE, 40, 160, 320, 0),
 	CE(ROMANIA, ETSI10_WORLD, 0, RO, 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(RWANDA, ETSI13_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,
 	   ETSI1_6G_02, SH, 40, 160, 320, 0),
@@ -716,8 +739,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	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, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
-	CE(SAUDI_ARABIA, ETSI15_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
-	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
+	CE(SAUDI_ARABIA, ETSI13_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
+	CE(SENEGAL, ETSI1_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI13_WORLD, 0, RS, 40, 160, 0, 0),
 	CE(SINGAPORE, APL20_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI10_WORLD, ETSI1_6G_02, SX, 40, 160, 320, 0),
@@ -750,12 +773,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 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, APL20_WORLD, 0, VN, 40, 160, 0, 0),
+	CE(VIET_NAM, ETSI15_WORLD, 0, VN, 40, 160, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC10_FCCA, FCC1_6G_01, VI, 40, 160, 320, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, ETSI1_6G_02, VG, 40, 160, 320,
 	   0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
 	CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
+	CE(ZAMBIA, ETSI13_WORLD, 0, ZM, 40, 160, 0, 0),
 	CE(ZIMBABWE, ETSI1_WORLD, 0, ZW, 40, 160, 0, 0),
 };
 #else
@@ -771,7 +795,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ARGENTINA, APL17_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, APL25_ETSIC, 0, AU, 40, 160, 0, 0),
+	CE(AUSTRALIA, APL25_ETSIC, ETSI2_6G_0C, AU, 40, 160, 320, 0),
 	CE(AUSTRIA, ETSI13_WORLD, 0, AT, 40, 160, 0, 0),
 	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
 	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
@@ -785,10 +809,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 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(BOTSWANA, ETSI13_WORLD, 0, BW, 40, 160, 0, 0),
 	CE(BRAZIL, FCC18_ETSIC, FCC1_6G_07, BR, 40, 160, 320, 0),
 	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
-	CE(BULGARIA, ETSI13_WORLD, 0, BG, 40, 160, 0, 0),
+	CE(BULGARIA, ETSI13_WORLD, ETSI1_6G_02, BG, 40, 160, 320, 0),
 	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURUNDI, ETSI13_WORLD, 0, BI, 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, FCC1_6G_05, CA, 40, 160, 320, 0),
@@ -797,8 +823,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, APL25_ETSIC, 0, CX, 40, 160, 0, 0),
 	CE(COLOMBIA, FCC17_FCCA, 0, CO, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 160, 320, 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, APL26_ETSIC, 0, CK, 40, 160, 0, 0),
@@ -818,12 +844,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI13_WORLD, ETSI1_6G_02, FK, 40, 160, 320, 0),
 	CE(FAROE_ISLANDS, ETSI13_WORLD, ETSI1_6G_02, FO, 40, 160, 320, 0),
+	CE(FIJI, APL1_WORLD, 0, FJ, 40, 160, 0, 0),
 	CE(FINLAND, ETSI13_WORLD, ETSI1_6G_02, FI, 40, 160, 320, 0),
 	CE(FRANCE, ETSI13_WORLD, ETSI1_6G_02, FR, 40, 160, 320, 0),
 	CE(FRENCH_GUIANA, ETSI13_WORLD, ETSI1_6G_02, GF, 40, 160, 320, 0),
 	CE(FRENCH_POLYNESIA, ETSI13_WORLD, ETSI1_6G_02, PF, 40, 160, 320, 0),
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI13_WORLD, ETSI1_6G_02, TF, 40, 160,
 	   320, 0),
+	CE(GABON, ETSI3_WORLD, 0, GA, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI13_WORLD, ETSI1_6G_02, DE, 40, 160, 320, 0),
 	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
@@ -837,12 +865,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(GUERNSEY, ETSI13_WORLD, ETSI1_6G_02, GG, 40, 160, 320, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
 	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
-	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, 0, HM, 40, 160, 0,
-	   0),
+	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, ETSI2_6G_0C, HM, 40,
+	   160, 320, 0),
 	CE(HOLY_SEE, ETSI13_WORLD, 0, VA, 40, 160, 0, 0),
 	CE(HONDURAS, FCC13_WORLD, FCC1_6G_07, HN, 40, 160, 320, 0),
-	CE(HONG_KONG, APL20_WORLD, 0, HK, 40, 160, 0, 0),
-	CE(HUNGARY, ETSI13_WORLD, 0, HU, 40, 160, 0, 0),
+	CE(HONG_KONG, APL20_WORLD, ETSI2_6G_03, HK, 40, 160, 320, 0),
+	CE(HUNGARY, ETSI13_WORLD, ETSI1_6G_02, HU, 40, 160, 320, 0),
 	CE(ICELAND, ETSI13_WORLD, ETSI1_6G_02, IS, 40, 160, 320, 0),
 	CE(INDIA, APL19_ETSIC, 0, IN, 40, 160, 0, 0),
 	CE(INDONESIA, APL2_ETSID, 0, ID, 40, 80, 0, 0),
@@ -856,14 +884,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(JAPAN15, MKK5_MKKC, 0, JP, 40, 160, 0, 0),
 	CE(XA, MKK5_MKKA, 0, XA, 40, 160, 0, 0),
 	CE(JERSEY, ETSI13_WORLD, ETSI1_6G_02, JE, 40, 160, 320, 0),
-	CE(JORDAN, APL4_WORLD, 0, JO, 40, 160, 0, 0),
+	CE(JORDAN, APL4_WORLD, ETSI1_6G_02, JO, 40, 160, 320, 0),
 	CE(KAZAKHSTAN, MKK5_MKKC, 0, KZ, 40, 160, 0, 0),
 	CE(KENYA, ETSI13_WORLD, 0, KE, 40, 160, 0, 0),
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI13_WORLD, 0, KW, 40, 160, 0, 0),
+	CE(LAO_PEOPLES_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, FCC1_6G_05, LA, 40,
+	   160, 320, 0),
 	CE(LATVIA, ETSI13_WORLD, 0, LV, 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(LIBYA, ETSI12_WORLD, 0, LY, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI13_WORLD, ETSI1_6G_02, LI, 40, 160, 320, 0),
 	CE(LITHUANIA, ETSI13_WORLD, ETSI1_6G_02, LT, 40, 160, 320, 0),
 	CE(LUXEMBOURG, ETSI13_WORLD, 0, LU, 40, 160, 0, 0),
@@ -899,7 +930,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   0),
 	CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, APL26_ETSIC, 0, NU, 40, 160, 0, 0),
-	CE(NORFOLK_ISLAND, APL25_ETSIC, 0, NF, 40, 160, 0, 0),
+	CE(NORFOLK_ISLAND, APL25_ETSIC, ETSI2_6G_0C, NF, 40, 160, 320, 0),
 	CE(NORWAY, ETSI13_WORLD, ETSI1_6G_02, NO, 40, 160, 320, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
@@ -912,11 +943,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(POLAND, ETSI13_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI13_WORLD, ETSI1_6G_02, PT, 40, 160, 320, 0),
 	CE(PUERTO_RICO, FCC3_FCCA, FCC1_6G_01, PR, 40, 160, 320, 0),
-	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
+	CE(QATAR, ETSI14_WORLD, ETSI1_6G_02, QA, 40, 160, 320, 0),
 	CE(REUNION, ETSI13_WORLD, ETSI1_6G_02, RE, 40, 160, 320, 0),
 	CE(ROMANIA, ETSI13_WORLD, 0, RO, 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(RWANDA, ETSI13_WORLD, 0, RW, 40, 160, 0, 0),
 	CE(SAINT_BARTHELEMY, ETSI1_WORLD, ETSI1_6G_02, BL, 40, 160, 0, 0),
 	CE(SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI13_WORLD,
 	   ETSI1_6G_02, SH, 40, 160, 320, 0),
@@ -930,8 +961,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	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, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
-	CE(SAUDI_ARABIA, ETSI15_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
-	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
+	CE(SAUDI_ARABIA, ETSI13_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
+	CE(SENEGAL, ETSI1_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI13_WORLD, 0, RS, 40, 160, 0, 0),
 	CE(SINGAPORE, APL20_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI13_WORLD, ETSI1_6G_02, SX, 40, 160, 320, 0),
@@ -956,7 +987,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UGANDA, FCC17_WORLD, 0, UG, 40, 160, 0, 0),
 	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, 0),
 	CE(UAE, ETSI13_WORLD, APL3_6G_08, AE, 40, 160, 320, 0),
-	CE(UNITED_KINGDOM, ETSI13_WORLD, ETSI2_6G_03, GB, 40, 160, 320, 0),
+	CE(UNITED_KINGDOM, ETSI18_WORLD, ETSI2_6G_03, GB, 40, 160, 320, 0),
 	CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 320, 0),
 	CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC3_FCCA, FCC1_6G_01, UM, 40,
 	   160, 320, 0),
@@ -964,12 +995,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 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, APL20_WORLD, 0, VN, 40, 80, 0, 0),
+	CE(VIET_NAM, ETSI15_WORLD, 0, VN, 40, 160, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC3_FCCA, FCC1_6G_01, VI, 40, 160, 320, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI13_WORLD, ETSI1_6G_02, VG, 40, 160, 320,
 	   0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
 	CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
+	CE(ZAMBIA, ETSI13_WORLD, 0, ZM, 40, 160, 0, 0),
 	CE(ZIMBABWE, ETSI1_WORLD, 0, ZW, 40, 160, 0, 0),
 };
 #endif
@@ -1022,6 +1054,7 @@ enum reg_domains_5g {
 	ETSI15,
 	ETSI16,
 	ETSI17,
+	ETSI18,
 	APL1,
 	APL2,
 	APL4,
@@ -1100,6 +1133,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{ETSI15_WORLD, ETSI15, WORLD},
 	{ETSI16_WORLD, ETSI16, WORLD},
 	{ETSI17_WORLD, ETSI17, WORLD},
+	{ETSI18_WORLD, ETSI18, WORLD},
 
 	{APL1_WORLD, APL1, WORLD},
 	{APL1_ETSIC, APL1, ETSIC},
@@ -1262,6 +1296,7 @@ enum reg_rules_5g {
 	CHAN_5490_5710_6,
 	CHAN_5490_5710_7,
 	CHAN_5490_5710_8,
+	CHAN_5490_5710_9,
 	CHAN_5490_5590_1,
 	CHAN_5490_5590_2,
 	CHAN_5490_5590_3,
@@ -1289,6 +1324,7 @@ enum reg_rules_5g {
 	CHAN_5735_5875_4,
 	CHAN_5735_5875_5,
 	CHAN_5735_5875_6,
+	CHAN_5735_5875_7,
 	CHAN_5735_5815_1,
 	CHAN_5735_5815_2,
 	CHAN_5735_5815_3,
@@ -1366,6 +1402,8 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5490_5710_6] = {5490, 5710, 160, 26, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_7] = {5490, 5710, 160, 23, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_8] = {5490, 5710, 20, 27, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5710_9] = {5490, 5710, 160, 30, REGULATORY_CHAN_RADAR |
+						   REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5490_5590_1] = {5490, 5590, 80, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5590_2] = {5490, 5590, 80, 24, 0},
 	[CHAN_5490_5590_3] = {5490, 5590, 80, 36, 0},
@@ -1393,6 +1431,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5875_4] = {5735, 5875, 80, 14, 0},
 	[CHAN_5735_5875_5] = {5735, 5875, 80, 20, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5875_6] = {5735, 5875, 80, 23, REGULATORY_CHAN_INDOOR_ONLY},
+	[CHAN_5735_5875_7] = {5735, 5875, 80, 14, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5815_1] = {5735, 5815, 80, 30, 0},
 	[CHAN_5735_5815_2] = {5735, 5815, 80, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5815_3] = {5735, 5815, 80, 23, REGULATORY_CHAN_INDOOR_ONLY},
@@ -1542,9 +1581,9 @@ const struct regdomain regdomains_5g[] = {
 							      CHAN_5735_5835_8}
 							      },
 
-	[ETSI13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_8,
+	[ETSI13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 4, {CHAN_5170_5250_8,
 							      CHAN_5250_5330_12,
-							      CHAN_5490_5730_5,
+							      CHAN_5490_5710_1,
 							      CHAN_5735_5875_4}
 							      },
 
@@ -1566,11 +1605,17 @@ const struct regdomain regdomains_5g[] = {
 
 	[ETSI17] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 5, {CHAN_5170_5250_8,
 							      CHAN_5250_5330_12,
-							      CHAN_5490_5730_8,
+							      CHAN_5490_5710_9,
 							      CHAN_5735_5835_10,
 							      CHAN_5835_5855_2}
 							      },
 
+	[ETSI18] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_8,
+							      CHAN_5250_5330_16,
+							      CHAN_5490_5730_5,
+							      CHAN_5735_5875_7}
+							      },
+
 	[APL1] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 80, 0, 1, {CHAN_5735_5835_2}
 							     },
 
@@ -1603,17 +1648,18 @@ const struct regdomain regdomains_5g[] = {
 							    CHAN_5490_5710_4,
 							    CHAN_5735_5875_2} },
 
-	[APL12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 80, 0, 3, {CHAN_5170_5250_2,
-							    CHAN_5490_5570_1,
-							    CHAN_5735_5775_1} },
+	[APL12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_2,
+							    CHAN_5250_5330_16,
+							    CHAN_5490_5730_8,
+							    CHAN_5735_5875_6} },
 
 	[APL13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 3, {CHAN_5170_5250_2,
 							     CHAN_5250_5330_1,
 							     CHAN_5490_5670_2}
 							     },
 
-	[APL14] = {CTL_MKK, DFS_CN_REGION, 2, 160, 0, 3, {CHAN_5170_5250_2,
-							  CHAN_5250_5330_1,
+	[APL14] = {CTL_MKK, DFS_CN_REGION, 2, 160, 0, 3, {CHAN_5170_5250_8,
+							  CHAN_5250_5330_12,
 							  CHAN_5735_5835_4} },
 
 	[APL15] = {CTL_FCC, DFS_UNINIT_REGION, 2, 160, 0, 3, {CHAN_5170_5250_2,
@@ -1809,6 +1855,10 @@ static const struct sixghz_super_to_subdomains g_6g_reg_dmn_9_tuples[] = {
 	 {MKK1_CLI_LPI_6G, MKK1_CLI_LPI_6G},
 	 {0, 0},
 	 {MKK1_CLI_VLP_6G, MKK1_CLI_VLP_6G} },
+	{ETSI2_6G_0C, ETSI2_AP_LPI_6G, 0, ETSI1_AP_VLP_6G,
+	 {ETSI2_CLI_LPI_6G, ETSI2_CLI_LPI_6G},
+	 {0, 0},
+	 {ETSI1_CLI_VLP_6G, ETSI1_CLI_VLP_6G} },
 	{FCC2_6G_10, FCC1_AP_LPI_6G, FCC2_AP_SP_6G, 0,
 	 {FCC1_CLI_LPI_DEFAULT_6G, 0},
 	 {FCC2_CLI_SP_6G, FCC2_CLI_SP_6G},
@@ -2088,6 +2138,7 @@ const uint32_t reg_5g_sub_dmn_code[REG_DOMAINS_5G_MAX] = {
 	[ETSI13] = 0x0E39,
 	[ETSI14] = 0x0E40,
 	[ETSI15] = 0x0E41,
+	[ETSI18] = 0x0E44,
 	[APL1] = 0x0150,
 	[APL2] = 0x0250,
 	[APL4] = 0x0450,

umac/regulatory/core/src/reg_db.h

@@ -177,6 +177,7 @@ struct reg_domain_pair {
  * @FCC1_6G_09: Super domain FCC1_6G_09 for US AFC Testing
  * @APL6_6G_0A: Super domain APL6_6G_0A for Saudi Arabia LPI STA and AP
  * @MKK1_6G_0B: Super domain MKK1_6G_0B for Japan LPI and VLP
+ * @ETSI2_6G_0C: Super domain ETSI2_6G_0C for Australia LPI and VLP
  * @FCC2_6G_10: Super domain FCC1_6G_10 for Canada LPI &
 		SP(VLP to be added later)
  * @APL4_6G_11: Super domain APL3_6G_11 for Costa Rica LPI and VLP
@@ -194,6 +195,7 @@ enum reg_super_domain_6g {
 	FCC1_6G_09 = 0x09,
 	APL6_6G_0A = 0x0A,
 	MKK1_6G_0B = 0x0B,
+	ETSI2_6G_0C = 0x0C,
 	FCC2_6G_10 = 0x10,
 	APL4_6G_11 = 0x11,
 	APL5_6G_12 = 0x12,