|
@@ -325,7 +325,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
|
|
CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
|
|
CE(ALBANIA, ETSI1_WORLD, 0, AL, 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(ALGERIA, APL13_WORLD, 0, DZ, 40, 160, 0, 0),
|
|
- CE(AMERICAN_SAMOA, FCC3_FCCA, 0, AS, 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(ANDORRA, ETSI1_WORLD, 0, AD, 40, 160, 0, 0),
|
|
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 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, FCC3_WORLD, 0, AG, 40, 160, 0, 0),
|
|
@@ -390,8 +390,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(GREENLAND, ETSI1_WORLD, 0, GL, 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, FCC3_FCCA, 0, GD, 40, 160, 0, 0),
|
|
CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
|
|
CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
|
|
- CE(GUAM, FCC3_FCCA, 0, GU, 40, 160, 0, 0),
|
|
|
|
- CE(GUATEMALA, ETSI1_WORLD, 0, GT, 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(GUERNSEY, ETSI1_WORLD, 0, GG, 40, 160, 0, 0),
|
|
CE(GUERNSEY, ETSI1_WORLD, 0, GG, 40, 160, 0, 0),
|
|
CE(GUYANA, APL1_ETSIC, 0, GY, 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, FCC3_FCCA, 0, HT, 40, 160, 0, 0),
|
|
@@ -450,7 +450,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(NEW_CALEDONIA, ETSI1_WORLD, 0, NC, 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, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
|
|
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
|
|
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
|
|
- CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, 0, MP, 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, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
|
|
CE(NIUE, ETSI1_WORLD, 0, NU, 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(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
|
|
@@ -465,7 +466,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
|
|
CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
|
|
CE(POLAND, ETSI1_WORLD, 0, PL, 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(PORTUGAL, ETSI1_WORLD, 0, PT, 40, 160, 0, 0),
|
|
- CE(PUERTO_RICO, FCC3_FCCA, 0, PR, 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(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
|
|
CE(REUNION, ETSI1_WORLD, 0, RE, 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(ROMANIA, ETSI1_WORLD, 0, RO, 40, 160, 0, 0),
|
|
@@ -510,14 +511,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(UAE, ETSI13_WORLD, 0, AE, 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_KINGDOM, ETSI1_WORLD, ETSI2_6G_03, GB, 40, 160, 160, 0),
|
|
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
|
|
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
|
|
- CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC8_FCCA, 0, UM, 40, 160, 0,
|
|
|
|
- 0),
|
|
|
|
|
|
+ CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC8_FCCA, FCC1_6G_01, UM, 40,
|
|
|
|
+ 160, 160, 0),
|
|
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
|
|
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
|
|
CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 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, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
|
|
CE(VENEZUELA, FCC2_ETSIC, 0, VE, 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, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
|
|
- CE(VIRGIN_ISLANDS, FCC3_FCCA, 0, VI, 40, 160, 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(VIRGIN_ISLANDS_BRITISH, ETSI1_WORLD, 0, VG, 40, 160, 0, 0),
|
|
CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
|
|
CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
|
|
CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
|
|
CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
|
|
@@ -530,7 +531,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
|
|
CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
|
|
CE(ALBANIA, ETSI13_WORLD, 0, AL, 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(ALGERIA, APL13_WORLD, 0, DZ, 40, 160, 0, 0),
|
|
- CE(AMERICAN_SAMOA, FCC3_FCCA, 0, AS, 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(ANDORRA, ETSI1_WORLD, 0, AD, 40, 160, 0, 0),
|
|
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
|
|
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
|
|
CE(ANTIGUA_AND_BARBUDA, ETSI10_WORLD, 0, AG, 40, 160, 0, 0),
|
|
CE(ANTIGUA_AND_BARBUDA, ETSI10_WORLD, 0, AG, 40, 160, 0, 0),
|
|
@@ -595,8 +596,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(GREENLAND, ETSI10_WORLD, 0, GL, 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, FCC3_FCCA, 0, GD, 40, 160, 0, 0),
|
|
CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
|
|
CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
|
|
- CE(GUAM, FCC10_FCCA, 0, GU, 40, 160, 0, 0),
|
|
|
|
- CE(GUATEMALA, ETSI1_WORLD, 0, GT, 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(GUERNSEY, ETSI10_WORLD, 0, GG, 40, 160, 0, 0),
|
|
CE(GUERNSEY, ETSI10_WORLD, 0, GG, 40, 160, 0, 0),
|
|
CE(GUYANA, APL1_ETSIC, 0, GY, 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, FCC3_FCCA, 0, HT, 40, 160, 0, 0),
|
|
@@ -656,7 +657,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(NEW_CALEDONIA, ETSI10_WORLD, 0, NC, 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, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
|
|
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
|
|
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
|
|
- CE(NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, 0, MP, 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, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
|
|
CE(NIUE, ETSI10_WORLD, 0, NU, 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(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
|
|
@@ -671,7 +673,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
|
|
CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
|
|
CE(POLAND, ETSI10_WORLD, 0, PL, 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(PORTUGAL, ETSI10_WORLD, 0, PT, 40, 160, 0, 0),
|
|
- CE(PUERTO_RICO, FCC10_FCCA, 0, PR, 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(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
|
|
CE(REUNION, ETSI1_WORLD, 0, RE, 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(ROMANIA, ETSI10_WORLD, 0, RO, 40, 160, 0, 0),
|
|
@@ -716,14 +718,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(UAE, FCC3_WORLD, 0, AE, 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_KINGDOM, ETSI10_WORLD, ETSI2_6G_03, GB, 40, 160, 160, 0),
|
|
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
|
|
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
|
|
- CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC10_FCCA, 0, UM, 40, 160, 0,
|
|
|
|
- 0),
|
|
|
|
|
|
+ CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC10_FCCA, FCC1_6G_01, UM,
|
|
|
|
+ 40, 160, 160, 0),
|
|
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
|
|
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
|
|
CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 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, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
|
|
CE(VENEZUELA, FCC2_ETSIC, 0, VE, 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, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
|
|
- CE(VIRGIN_ISLANDS, FCC10_FCCA, 0, VI, 40, 160, 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(VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, 0, VG, 40, 160, 0, 0),
|
|
CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
|
|
CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
|
|
CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
|
|
CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
|
|
@@ -735,7 +737,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
|
|
CE(ALAND_ISLANDS, FCC3_WORLD, 0, AX, 40, 160, 0, 0),
|
|
CE(ALBANIA, ETSI13_WORLD, 0, AL, 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(ALGERIA, APL13_WORLD, 0, DZ, 40, 160, 0, 0),
|
|
- CE(AMERICAN_SAMOA, FCC3_FCCA, 0, AS, 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(ANDORRA, ETSI13_WORLD, 0, AD, 40, 160, 0, 0),
|
|
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 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, FCC3_WORLD, 0, AG, 40, 160, 0, 0),
|
|
@@ -800,8 +802,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(GREENLAND, ETSI1_WORLD, 0, GL, 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, FCC3_FCCA, 0, GD, 40, 160, 0, 0),
|
|
CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
|
|
CE(GUADELOUPE, ETSI1_WORLD, 0, GP, 40, 160, 0, 0),
|
|
- CE(GUAM, FCC3_FCCA, 0, GU, 40, 160, 0, 0),
|
|
|
|
- CE(GUATEMALA, ETSI1_WORLD, 0, GT, 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(GUERNSEY, ETSI13_WORLD, 0, GG, 40, 160, 0, 0),
|
|
CE(GUERNSEY, ETSI13_WORLD, 0, GG, 40, 160, 0, 0),
|
|
CE(GUYANA, APL1_ETSIC, 0, GY, 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, FCC3_FCCA, 0, HT, 40, 160, 0, 0),
|
|
@@ -861,7 +863,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(NEW_CALEDONIA, ETSI13_WORLD, 0, NC, 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, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
|
|
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
|
|
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
|
|
- CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, 0, MP, 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, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
|
|
CE(NIUE, ETSI13_WORLD, 0, NU, 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(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
|
|
@@ -876,7 +879,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
|
|
CE(PHILIPPINES, FCC3_WORLD, 0, PH, 40, 160, 0, 0),
|
|
CE(POLAND, ETSI13_WORLD, 0, PL, 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(PORTUGAL, ETSI13_WORLD, 0, PT, 40, 160, 0, 0),
|
|
- CE(PUERTO_RICO, FCC3_FCCA, 0, PR, 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(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
|
|
CE(REUNION, ETSI1_WORLD, 0, RE, 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(ROMANIA, ETSI13_WORLD, 0, RO, 40, 160, 0, 0),
|
|
@@ -921,14 +924,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
|
CE(UAE, ETSI13_WORLD, 0, AE, 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_KINGDOM, ETSI13_WORLD, ETSI2_6G_03, GB, 40, 160, 160, 0),
|
|
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
|
|
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 160, 0),
|
|
- CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC3_FCCA, 0, UM, 40, 160, 0,
|
|
|
|
- 0),
|
|
|
|
|
|
+ CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC3_FCCA, FCC1_6G_01, UM, 40,
|
|
|
|
+ 160, 160, 0),
|
|
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
|
|
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
|
|
CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 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, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
|
|
CE(VENEZUELA, FCC2_ETSIC, 0, VE, 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, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
|
|
- CE(VIRGIN_ISLANDS, FCC3_FCCA, 0, VI, 40, 160, 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(VIRGIN_ISLANDS_BRITISH, ETSI13_WORLD, 0, VG, 40, 160, 0, 0),
|
|
CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
|
|
CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
|
|
CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
|
|
CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
|
|
@@ -1644,6 +1647,10 @@ enum reg_subdomains_6g {
|
|
APL1_CLI_LPI_6G = APL1_AP_LPI_6G,
|
|
APL1_CLI_LPI_6G = APL1_AP_LPI_6G,
|
|
APL1_AP_VLP_6G = 0x21,
|
|
APL1_AP_VLP_6G = 0x21,
|
|
APL1_CLI_VLP_6G = APL1_AP_VLP_6G,
|
|
APL1_CLI_VLP_6G = APL1_AP_VLP_6G,
|
|
|
|
+ APL2_AP_LPI_6G = 0x22,
|
|
|
|
+ APL2_CLI_LPI_6G = APL2_AP_LPI_6G,
|
|
|
|
+ APL2_AP_VLP_6G = 0x23,
|
|
|
|
+ APL2_CLI_VLP_6G = APL2_AP_VLP_6G,
|
|
};
|
|
};
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1666,12 +1673,16 @@ static const struct sixghz_super_to_subdomains g_6g_reg_dmn_9_tuples[] = {
|
|
{FCC1_6G_05, FCC1_AP_LPI_6G, 0, 0,
|
|
{FCC1_6G_05, FCC1_AP_LPI_6G, 0, 0,
|
|
{FCC1_CLI_LPI_REGULAR_6G, FCC1_CLI_LPI_SUBORDINATE}, {0, 0},
|
|
{FCC1_CLI_LPI_REGULAR_6G, FCC1_CLI_LPI_SUBORDINATE}, {0, 0},
|
|
{0, 0} },
|
|
{0, 0} },
|
|
|
|
+ {APL2_6G_06, APL2_AP_LPI_6G, 0, APL2_AP_VLP_6G,
|
|
|
|
+ {APL2_CLI_LPI_6G, APL2_CLI_LPI_6G}, {0, 0},
|
|
|
|
+ {APL2_CLI_VLP_6G, APL2_CLI_VLP_6G} },
|
|
};
|
|
};
|
|
|
|
|
|
/**
|
|
/**
|
|
* List of 6G reg rules.
|
|
* List of 6G reg rules.
|
|
*/
|
|
*/
|
|
enum reg_rules_6g {
|
|
enum reg_rules_6g {
|
|
|
|
+ CHAN_5925_6425_1,
|
|
CHAN_5945_6425_1,
|
|
CHAN_5945_6425_1,
|
|
CHAN_5945_6425_2,
|
|
CHAN_5945_6425_2,
|
|
CHAN_5945_6425_3,
|
|
CHAN_5945_6425_3,
|
|
@@ -1685,20 +1696,25 @@ enum reg_rules_6g {
|
|
CHAN_6425_6525_1,
|
|
CHAN_6425_6525_1,
|
|
CHAN_6425_6525_2,
|
|
CHAN_6425_6525_2,
|
|
CHAN_6425_6525_3,
|
|
CHAN_6425_6525_3,
|
|
|
|
+ CHAN_6425_6525_4,
|
|
CHAN_6525_6875_1,
|
|
CHAN_6525_6875_1,
|
|
CHAN_6525_6875_2,
|
|
CHAN_6525_6875_2,
|
|
CHAN_6525_6875_3,
|
|
CHAN_6525_6875_3,
|
|
CHAN_6525_6875_4,
|
|
CHAN_6525_6875_4,
|
|
CHAN_6525_6875_5,
|
|
CHAN_6525_6875_5,
|
|
|
|
+ CHAN_6525_6875_6,
|
|
CHAN_6875_7125_1,
|
|
CHAN_6875_7125_1,
|
|
CHAN_6875_7125_2,
|
|
CHAN_6875_7125_2,
|
|
CHAN_6875_7125_3,
|
|
CHAN_6875_7125_3,
|
|
|
|
+ CHAN_6875_7125_4,
|
|
};
|
|
};
|
|
|
|
|
|
/**
|
|
/**
|
|
* Mapping of 6G reg rules present in the 6G sub domain.
|
|
* Mapping of 6G reg rules present in the 6G sub domain.
|
|
*/
|
|
*/
|
|
static const struct regulatory_rule_ext reg_rules_6g[] = {
|
|
static const struct regulatory_rule_ext reg_rules_6g[] = {
|
|
|
|
+ [CHAN_5925_6425_1] = {5925, 6425, 160, 23, REG_MAX_PSD,
|
|
|
|
+ REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_5945_6425_1] = {5945, 6425, 160, 30, 5,
|
|
[CHAN_5945_6425_1] = {5945, 6425, 160, 30, 5,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_5945_6425_2] = {5945, 6425, 160, 36, 23, 0},
|
|
[CHAN_5945_6425_2] = {5945, 6425, 160, 36, 23, 0},
|
|
@@ -1720,6 +1736,8 @@ static const struct regulatory_rule_ext reg_rules_6g[] = {
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6425_6525_3] = {6425, 6525, 100, 63, 2,
|
|
[CHAN_6425_6525_3] = {6425, 6525, 100, 63, 2,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+ [CHAN_6425_6525_4] = {6425, 6525, 100, 23, REG_MAX_PSD,
|
|
|
|
+ REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6525_6875_1] = {6525, 6875, 160, 30, 5,
|
|
[CHAN_6525_6875_1] = {6525, 6875, 160, 30, 5,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6525_6875_2] = {6525, 6875, 160, 36, 23, 0},
|
|
[CHAN_6525_6875_2] = {6525, 6875, 160, 36, 23, 0},
|
|
@@ -1728,12 +1746,16 @@ static const struct regulatory_rule_ext reg_rules_6g[] = {
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6525_6875_5] = {6525, 6875, 160, 63, 2,
|
|
[CHAN_6525_6875_5] = {6525, 6875, 160, 63, 2,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+ [CHAN_6525_6875_6] = {6525, 6875, 160, 22, REG_MAX_PSD,
|
|
|
|
+ REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6875_7125_1] = {6875, 7125, 160, 30, 5,
|
|
[CHAN_6875_7125_1] = {6875, 7125, 160, 30, 5,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6875_7125_2] = {6875, 7125, 160, 24, -1,
|
|
[CHAN_6875_7125_2] = {6875, 7125, 160, 24, -1,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
[CHAN_6875_7125_3] = {6875, 7125, 160, 63, 2,
|
|
[CHAN_6875_7125_3] = {6875, 7125, 160, 63, 2,
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+ [CHAN_6875_7125_4] = {6875, 7125, 160, 22, REG_MAX_PSD,
|
|
|
|
+ REGULATORY_CHAN_INDOOR_ONLY},
|
|
};
|
|
};
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1761,6 +1783,14 @@ static const struct sub_6g_regdomain sub_regdomains_6g[] = {
|
|
CHAN_6525_6875_5,
|
|
CHAN_6525_6875_5,
|
|
CHAN_6875_7125_3} },
|
|
CHAN_6875_7125_3} },
|
|
[APL1_AP_VLP_6G] = {2, 160, 1, {CHAN_5945_6425_10} },
|
|
[APL1_AP_VLP_6G] = {2, 160, 1, {CHAN_5945_6425_10} },
|
|
|
|
+ [APL2_AP_LPI_6G] = {2, 160, 4, {CHAN_5925_6425_1,
|
|
|
|
+ CHAN_6425_6525_4,
|
|
|
|
+ CHAN_6525_6875_6,
|
|
|
|
+ CHAN_6875_7125_4} },
|
|
|
|
+ [APL2_AP_VLP_6G] = {2, 160, 4, {CHAN_5925_6425_1,
|
|
|
|
+ CHAN_6425_6525_4,
|
|
|
|
+ CHAN_6525_6875_6,
|
|
|
|
+ CHAN_6875_7125_4} },
|
|
};
|
|
};
|
|
#endif
|
|
#endif
|
|
#ifdef CONFIG_REG_CLIENT
|
|
#ifdef CONFIG_REG_CLIENT
|