qcacmn: Update regdb based on database version 31

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

1) Map Andorra to ETSI1_WORLD for WIN and DSRC, and ETSI13_WORLD for MCC.
2) Map Armenia to APL4_WORLD for WIN, and ETSI4_WORLD for DSRC and MCC.
3) Enable 40, 80 and 160 MHz BW support for Armenia.
4) Enable 40, 80 and 160 MHz BW support for Bahrain.
5) Add Indoor flag in lower bands for APL15.
6) Map Bolivia to FCC8_WORLD for WIN  and FCC3_WORLD for MCC.
7) Map Brunei to FCC8_WORLD for WIN and FCC3_WORLD for MCC.
8) Map Ecuador to FCC3_FCCA for WIN and MCC.
9) Enable 40, 80 and 160 MHz BW support for Ecuador.
10) Map El Salvador to FCC3_WORLD for WIN and MCC.
11) Enable 40, 80 and 160 MHz BW support for El Salvador.
12) Map Japan to MKK17_MKKC for MCC and DSRC.
13) Map Kuwait to ETSI1_WORLD for WIN and ETSI13_WORLD for MCC and DSRC.
14) Map Sri Lanka to FCC3_ETSIC for WIN, MCC and DSRC.
15) Enable 40, 80 and 160 MHz BW support for Sri Lanka.
16) Map Yemen to ETSI1_WORLD for WIN, MCC and DSRC.
17) Enable 40, 80 and 160 MHz BW support for Yemen.
18) Remove 40/80/160 MHz channels support in ETSI11.

Change-Id: Ieba86cb99f6963432777cd6aaa6ffb6b3e72b657
CRs-Fixed: 2662186

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 30.
+ * Current implementation conforms to database version 31.
  */
 
 #include <qdf_types.h>
@@ -118,6 +118,8 @@ enum country_code {
 	CTRY_ISRAEL = 376,
 	CTRY_ITALY = 380,
 	CTRY_JAMAICA = 388,
+	CTRY_JAPAN = 392,
+	CTRY_JAPAN15 = 4015,
 	CTRY_JERSEY = 832,
 	CTRY_JORDAN = 400,
 	CTRY_KAZAKHSTAN = 398,
@@ -223,11 +225,9 @@ enum country_code {
 	CTRY_VIRGIN_ISLANDS = 850,
 	CTRY_VIRGIN_ISLANDS_BRITISH = 92,
 	CTRY_WALLIS_AND_FUTUNA = 876,
+	CTRY_XA = 4100,   /* Used by Linux Client for legacy MKK domain */
 	CTRY_YEMEN = 887,
 	CTRY_ZIMBABWE = 716,
-	CTRY_JAPAN = 392,
-	CTRY_JAPAN15 = 4015,
-	CTRY_XA = 4100,
 };
 
 enum reg_domain {
@@ -246,6 +246,7 @@ enum reg_domain {
 	FCC6_WORLD = 0x23,
 	FCC6_FCCA = 0x14,
 	FCC8_FCCA = 0x16,
+	FCC8_WORLD = 0x09,
 	FCC9_FCCA = 0x17,
 	FCC10_FCCA = 0x18,
 	FCC11_WORLD = 0x19,
@@ -323,17 +324,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_ALBANIA, ETSI1_WORLD, "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
-	{CTRY_ANDORRA, ETSI3_WORLD, "AD", 40, 160, 0},
+	{CTRY_ANDORRA, ETSI1_WORLD, "AD", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
 	{CTRY_ANTIGUA_AND_BARBUDA, ETSI1_WORLD, "AG", 40, 160, 0},
 	{CTRY_ARGENTINA, APL16_ETSIC, "AR", 40, 160, 0},
-	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
+	{CTRY_ARMENIA, APL4_WORLD, "AM", 40, 160, 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_BAHRAIN, APL15_WORLD, "BH", 40, 160, 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},
@@ -341,10 +342,10 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_BOLIVIA, FCC8_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_BRUNEI_DARUSSALAM, FCC8_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},
@@ -366,9 +367,9 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_DENMARK, ETSI1_WORLD, "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC1_FCCA, "DM", 40, 160, 0},
 	{CTRY_DOMINICAN_REPUBLIC, FCC3_FCCA, "DO", 40, 160, 0},
-	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
+	{CTRY_ECUADOR, FCC3_FCCA, "EC", 40, 160, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
-	{CTRY_EL_SALVADOR, FCC1_WORLD, "SV", 40, 20, 0},
+	{CTRY_EL_SALVADOR, FCC3_WORLD, "SV", 40, 160, 0},
 	{CTRY_ESTONIA, ETSI1_WORLD, "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
 	{CTRY_FALKLAND_ISLANDS, ETSI1_WORLD, "FK", 40, 160, 0},
@@ -405,12 +406,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_JAPAN, MKK17_MKKC, "JP", 40, 160, 0},
+	{CTRY_JAPAN15, MKK17_MKKC, "JP", 40, 160, 0},
 	{CTRY_JERSEY, ETSI1_WORLD, "JE", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
 	{CTRY_KAZAKHSTAN, MKK5_MKKC, "KZ", 40, 160, 0},
 	{CTRY_KENYA, ETSI13_WORLD, "KE", 40, 160, 0},
 	{CTRY_KOREA_ROC, APL9_MKKC, "KR", 40, 160, 0},
-	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
+	{CTRY_KUWAIT, ETSI1_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},
@@ -443,7 +446,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", 40, 160, 0},
 	{CTRY_NEW_CALEDONIA, ETSI1_WORLD, "NC", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", 40, 160, 0},
-	{CTRY_NIGERIA, APL8_WORLD, "NG", 40, 160, 0},
+	{CTRY_NIGERIA, APL6_WORLD, "NG", 40, 160, 0},
 	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", 40, 160, 0},
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
 	{CTRY_NIUE, ETSI1_WORLD, "NU", 40, 160, 0},
@@ -487,7 +490,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_SRI_LANKA, FCC3_ETSIC, "LK", 40, 160, 0},
 	{CTRY_SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, "SJ", 40, 160, 0},
 	{CTRY_SWEDEN, ETSI1_WORLD, "SE", 40, 160, 0},
 	{CTRY_SWITZERLAND, ETSI1_WORLD, "CH", 40, 160, 0},
@@ -514,10 +517,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", 40, 160, 0},
 	{CTRY_VIRGIN_ISLANDS_BRITISH, ETSI1_WORLD, "VG", 40, 160, 0},
 	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", 40, 160, 0},
-	{CTRY_YEMEN, NULL1_WORLD, "YE", 40, 0, 0},
+	{CTRY_YEMEN, ETSI1_WORLD, "YE", 40, 160, 0},
 	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", 40, 160, 0},
-	{CTRY_JAPAN, MKK17_MKKC, "JP", 40, 160, 0},
-	{CTRY_JAPAN15, MKK17_MKKC, "JP", 40, 160, 0},
 };
 #else
 #ifdef WLAN_FEATURE_DSRC
@@ -527,17 +528,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_ALBANIA, ETSI13_WORLD, "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
-	{CTRY_ANDORRA, ETSI3_WORLD, "AD", 40, 160, 0},
+	{CTRY_ANDORRA, ETSI1_WORLD, "AD", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
 	{CTRY_ANTIGUA_AND_BARBUDA, ETSI10_WORLD, "AG", 40, 160, 0},
 	{CTRY_ARGENTINA, APL17_ETSIC, "AR", 40, 160, 0},
-	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
+	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 160, 0},
 	{CTRY_ARUBA, ETSI1_WORLD, "AW", 40, 160, 0},
 	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", 40, 160, 0},
 	{CTRY_AUSTRIA, ETSI10_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_BAHRAIN, APL15_WORLD, "BH", 40, 160, 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},
@@ -545,10 +546,10 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_BOLIVIA, FCC3_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_BRUNEI_DARUSSALAM, FCC3_WORLD, "BN", 40, 160, 0},
 	{CTRY_BULGARIA, ETSI10_WORLD, "BG", 40, 160, 0},
 	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", 40, 160, 0},
 	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", 40, 160, 0},
@@ -570,9 +571,9 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_DENMARK, ETSI10_WORLD, "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC2_FCCA, "DM", 40, 160, 0},
 	{CTRY_DOMINICAN_REPUBLIC, FCC3_FCCA, "DO", 40, 160, 0},
-	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
+	{CTRY_ECUADOR, FCC3_FCCA, "EC", 40, 160, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
-	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", 40, 20, 0},
+	{CTRY_EL_SALVADOR, FCC3_WORLD, "SV", 40, 160, 0},
 	{CTRY_ESTONIA, ETSI10_WORLD, "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
 	{CTRY_FALKLAND_ISLANDS, ETSI10_WORLD, "FK", 40, 160, 0},
@@ -609,12 +610,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_ISRAEL, ETSI3_WORLD, "IL", 40, 160, 0},
 	{CTRY_ITALY, ETSI10_WORLD, "IT", 40, 160,  0},
 	{CTRY_JAMAICA, FCC13_WORLD, "JM", 40, 160, 0},
+	{CTRY_JAPAN, MKK17_MKKC, "JP", 40, 160, 0},
+	{CTRY_JAPAN15, MKK5_MKKC, "JP", 40, 160, 0},
+	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
 	{CTRY_JERSEY, ETSI10_WORLD, "JE", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
 	{CTRY_KAZAKHSTAN, MKK5_MKKC, "KZ", 40, 160, 0},
 	{CTRY_KENYA, ETSI13_WORLD, "KE", 40, 160, 0},
 	{CTRY_KOREA_ROC, APL9_MKKC, "KR", 40, 160, 0},
-	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
+	{CTRY_KUWAIT, ETSI13_WORLD, "KW", 40, 160, 0},
 	{CTRY_LATVIA, ETSI10_WORLD, "LV", 40, 160, 0},
 	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
 	{CTRY_LESOTHO, ETSI1_WORLD, "LS", 40, 160, 0},
@@ -647,7 +651,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_NETHERLANDS_ANTILLES, ETSI10_WORLD, "AN", 40, 160, 0},
 	{CTRY_NEW_CALEDONIA, ETSI10_WORLD, "NC", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", 40, 160, 0},
-	{CTRY_NIGERIA, APL8_WORLD, "NG", 40, 160, 0},
+	{CTRY_NIGERIA, APL6_WORLD, "NG", 40, 160, 0},
 	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, "MP", 40, 160, 0},
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
 	{CTRY_NIUE, ETSI10_WORLD, "NU", 40, 160, 0},
@@ -691,7 +695,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", 40, 160, 0},
 	{CTRY_SPAIN, ETSI10_WORLD, "ES", 40, 160, 0},
 	{CTRY_SURINAME, ETSI1_WORLD, "SR", 40, 160, 0},
-	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", 40, 20, 0},
+	{CTRY_SRI_LANKA, FCC3_ETSIC, "LK", 40, 160, 0},
 	{CTRY_SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, "SJ", 40, 160, 0},
 	{CTRY_SWEDEN, ETSI10_WORLD, "SE", 40, 160, 0},
 	{CTRY_SWITZERLAND, ETSI10_WORLD, "CH", 40, 160, 0},
@@ -718,11 +722,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_VIRGIN_ISLANDS, FCC10_FCCA, "VI", 40, 160, 0},
 	{CTRY_VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, "VG", 40, 160, 0},
 	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", 40, 160, 0},
-	{CTRY_YEMEN, NULL1_WORLD, "YE", 40, 0, 0},
+	{CTRY_YEMEN, ETSI1_WORLD, "YE", 40, 160, 0},
 	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", 40, 160, 0},
-	{CTRY_JAPAN, MKK5_MKKC, "JP", 40, 160, 0},
-	{CTRY_JAPAN15, MKK5_MKKC, "JP", 40, 160, 0},
-	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
 };
 #else
 const struct country_code_to_reg_domain g_all_countries[] = {
@@ -731,17 +732,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_ALBANIA, ETSI13_WORLD, "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
-	{CTRY_ANDORRA, ETSI3_WORLD, "AD", 40, 160, 0},
+	{CTRY_ANDORRA, ETSI13_WORLD, "AD", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
 	{CTRY_ANTIGUA_AND_BARBUDA, ETSI13_WORLD, "AG", 40, 160, 0},
 	{CTRY_ARGENTINA, APL17_ETSIC, "AR", 40, 160, 0},
-	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
+	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 160, 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_BAHRAIN, APL15_WORLD, "BH", 40, 160, 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},
@@ -749,10 +750,10 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_BOLIVIA, FCC3_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_BRUNEI_DARUSSALAM, FCC3_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},
@@ -774,9 +775,9 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_DENMARK, ETSI13_WORLD, "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC2_FCCA, "DM", 40, 160, 0},
 	{CTRY_DOMINICAN_REPUBLIC, FCC3_FCCA, "DO", 40, 160, 0},
-	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
+	{CTRY_ECUADOR, FCC3_FCCA, "EC", 40, 160, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
-	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", 40, 20, 0},
+	{CTRY_EL_SALVADOR, FCC3_WORLD, "SV", 40, 160, 0},
 	{CTRY_ESTONIA, ETSI13_WORLD, "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
 	{CTRY_FALKLAND_ISLANDS, ETSI13_WORLD, "FK", 40, 160, 0},
@@ -813,12 +814,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_JAPAN, MKK17_MKKC, "JP", 40, 160, 0},
+	{CTRY_JAPAN15, MKK5_MKKC, "JP", 40, 160, 0},
+	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
 	{CTRY_JERSEY, ETSI13_WORLD, "JE", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
 	{CTRY_KAZAKHSTAN, MKK5_MKKC, "KZ", 40, 160, 0},
 	{CTRY_KENYA, ETSI13_WORLD, "KE", 40, 160, 0},
 	{CTRY_KOREA_ROC, APL9_MKKC, "KR", 40, 160, 0},
-	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
+	{CTRY_KUWAIT, ETSI13_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},
@@ -851,7 +855,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_NETHERLANDS_ANTILLES, ETSI13_WORLD, "AN", 40, 160, 0},
 	{CTRY_NEW_CALEDONIA, ETSI13_WORLD, "NC", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", 40, 160, 0},
-	{CTRY_NIGERIA, APL8_WORLD, "NG", 40, 160, 0},
+	{CTRY_NIGERIA, APL6_WORLD, "NG", 40, 160, 0},
 	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", 40, 160, 0},
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
 	{CTRY_NIUE, ETSI13_WORLD, "NU", 40, 160, 0},
@@ -895,7 +899,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{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_SRI_LANKA, FCC3_ETSIC, "LK", 40, 160, 0},
 	{CTRY_SVALBARD_AND_JAN_MAYEN, FCC6_WORLD, "SJ", 40, 160, 0},
 	{CTRY_SWEDEN, ETSI13_WORLD, "SE", 40, 160, 0},
 	{CTRY_SWITZERLAND, ETSI13_WORLD, "CH", 40, 160, 0},
@@ -922,11 +926,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", 40, 160, 0},
 	{CTRY_VIRGIN_ISLANDS_BRITISH, ETSI13_WORLD, "VG", 40, 160, 0},
 	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", 40, 160, 0},
-	{CTRY_YEMEN, NULL1_WORLD, "YE", 40, 0, 0},
+	{CTRY_YEMEN, ETSI1_WORLD, "YE", 40, 160, 0},
 	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", 40, 160, 0},
-	{CTRY_JAPAN, MKK5_MKKC, "JP", 40, 160, 0},
-	{CTRY_JAPAN15, MKK5_MKKC, "JP", 40, 160, 0},
-	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
 };
 #endif
 #endif
@@ -1024,6 +1025,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{FCC6_WORLD, FCC6, WORLD},
 	{FCC6_FCCA, FCC6, FCCA},
 	{FCC8_FCCA, FCC8, FCCA},
+	{FCC8_WORLD, FCC8, WORLD},
 	{FCC10_FCCA, FCC10, FCCA},
 	{FCC11_WORLD, FCC11, WORLD},
 	{FCC13_WORLD, FCC13, WORLD},
@@ -1160,6 +1162,7 @@ enum reg_rules_5g {
 	CHAN_5170_5250_7,
 	CHAN_5170_5250_8,
 	CHAN_5170_5250_9,
+	CHAN_5170_5250_10,
 	CHAN_5170_5330_1,
 	CHAN_5170_5330_2,
 	CHAN_5250_5330_1,
@@ -1176,6 +1179,8 @@ enum reg_rules_5g {
 	CHAN_5250_5330_12,
 	CHAN_5250_5330_13,
 	CHAN_5250_5330_14,
+	CHAN_5250_5330_15,
+	CHAN_5250_5330_16,
 	CHAN_5490_5730_1,
 	CHAN_5490_5730_2,
 	CHAN_5490_5730_3,
@@ -1190,6 +1195,7 @@ enum reg_rules_5g {
 	CHAN_5490_5710_5,
 	CHAN_5490_5710_6,
 	CHAN_5490_5710_7,
+	CHAN_5490_5710_8,
 	CHAN_5490_5590_1,
 	CHAN_5490_5590_2,
 	CHAN_5490_5590_3,
@@ -1250,6 +1256,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5170_5250_7] = {5170, 5250, 80, 20, REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5170_5250_8] = {5170, 5250, 80, 23, REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5170_5250_9] = {5170, 5250, 40, 30, 0},
+	[CHAN_5170_5250_10] = {5170, 5250, 20, 20, REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5170_5330_1] = {5170, 5330, 160, 20, REGULATORY_CHAN_NO_IR},
 	[CHAN_5170_5330_2] = {5170, 5330, 160, 24, 0},
 	[CHAN_5250_5330_1] = {5250, 5330, 80, 23, REGULATORY_CHAN_RADAR},
@@ -1268,6 +1275,9 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5250_5330_13] = {5250, 5330, 40, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5250_5330_14] = {5250, 5330, 80, 20, REGULATORY_CHAN_RADAR |
 						   REGULATORY_CHAN_INDOOR_ONLY},
+	[CHAN_5250_5330_15] = {5250, 5330, 20, 20, REGULATORY_CHAN_RADAR |
+						   REGULATORY_CHAN_INDOOR_ONLY},
+	[CHAN_5250_5330_16] = {5250, 5330, 80, 23, REGULATORY_CHAN_INDOOR_ONLY},
 	[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},
@@ -1282,6 +1292,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5490_5710_5] = {5490, 5710, 160, 24, REGULATORY_CHAN_RADAR},
 	[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_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},
@@ -1433,9 +1444,9 @@ const struct regdomain regdomains_5g[] = {
 							  CHAN_5490_5710_3,
 							  CHAN_5850_5925_2} },
 
-	[ETSI11] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_7,
-							  CHAN_5250_5330_14,
-							  CHAN_5490_5710_3,
+	[ETSI11] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_10,
+							  CHAN_5250_5330_15,
+							  CHAN_5490_5710_8,
 							  CHAN_5735_5875_1} },
 
 	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_7,
@@ -1499,8 +1510,8 @@ const struct regdomain regdomains_5g[] = {
 						     CHAN_5250_5330_1,
 						     CHAN_5735_5835_4} },
 
-	[APL15] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_2,
-							 CHAN_5250_5330_5,
+	[APL15] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_8,
+							 CHAN_5250_5330_16,
 							 CHAN_5735_5835_4} },
 
 	[APL16] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 5, {CHAN_5170_5250_1,