|
@@ -251,7 +251,11 @@ enum reg_domain {
|
|
FCC11_WORLD = 0x19,
|
|
FCC11_WORLD = 0x19,
|
|
FCC13_WORLD = 0xE4,
|
|
FCC13_WORLD = 0xE4,
|
|
FCC14_FCCB = 0xE6,
|
|
FCC14_FCCB = 0xE6,
|
|
-
|
|
|
|
|
|
+#ifdef CONFIG_BAND_6GHZ
|
|
|
|
+ FCC15_FCCA = 0xEA,
|
|
|
|
+ FCC16_FCCA = 0xE8,
|
|
|
|
+ FCC17_FCCA = 0xE9,
|
|
|
|
+#endif
|
|
ETSI1_WORLD = 0x37,
|
|
ETSI1_WORLD = 0x37,
|
|
ETSI3_WORLD = 0x36,
|
|
ETSI3_WORLD = 0x36,
|
|
ETSI4_WORLD = 0x30,
|
|
ETSI4_WORLD = 0x30,
|
|
@@ -952,6 +956,11 @@ enum reg_domains_5g {
|
|
FCC11,
|
|
FCC11,
|
|
FCC13,
|
|
FCC13,
|
|
FCC14,
|
|
FCC14,
|
|
|
|
+#ifdef CONFIG_BAND_6GHZ
|
|
|
|
+ FCC15,
|
|
|
|
+ FCC16,
|
|
|
|
+ FCC17,
|
|
|
|
+#endif
|
|
ETSI1,
|
|
ETSI1,
|
|
ETSI3,
|
|
ETSI3,
|
|
ETSI4,
|
|
ETSI4,
|
|
@@ -1012,7 +1021,11 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
|
|
{FCC11_WORLD, FCC11, WORLD},
|
|
{FCC11_WORLD, FCC11, WORLD},
|
|
{FCC13_WORLD, FCC13, WORLD},
|
|
{FCC13_WORLD, FCC13, WORLD},
|
|
{FCC14_FCCB, FCC14, FCCB},
|
|
{FCC14_FCCB, FCC14, FCCB},
|
|
-
|
|
|
|
|
|
+#ifdef CONFIG_BAND_6GHZ
|
|
|
|
+ {FCC15_FCCA, FCC15, FCCA},
|
|
|
|
+ {FCC16_FCCA, FCC16, FCCA},
|
|
|
|
+ {FCC17_FCCA, FCC17, FCCA},
|
|
|
|
+#endif
|
|
{ETSI1_WORLD, ETSI1, WORLD},
|
|
{ETSI1_WORLD, ETSI1, WORLD},
|
|
{ETSI3_WORLD, ETSI3, WORLD},
|
|
{ETSI3_WORLD, ETSI3, WORLD},
|
|
{ETSI4_WORLD, ETSI4, WORLD},
|
|
{ETSI4_WORLD, ETSI4, WORLD},
|
|
@@ -1204,6 +1217,16 @@ enum reg_rules_5g {
|
|
CHAN_5855_5875_1,
|
|
CHAN_5855_5875_1,
|
|
CHAN_5850_5925_1,
|
|
CHAN_5850_5925_1,
|
|
CHAN_5850_5925_2,
|
|
CHAN_5850_5925_2,
|
|
|
|
+#ifdef CONFIG_BAND_6GHZ
|
|
|
|
+ CHAN_5935_6435_1,
|
|
|
|
+ CHAN_5935_6435_2,
|
|
|
|
+ CHAN_6435_6535_1,
|
|
|
|
+ CHAN_6435_6535_2,
|
|
|
|
+ CHAN_6535_6875_1,
|
|
|
|
+ CHAN_6535_6875_2,
|
|
|
|
+ CHAN_6875_7115_1,
|
|
|
|
+ CHAN_6875_7115_2,
|
|
|
|
+#endif
|
|
};
|
|
};
|
|
|
|
|
|
const struct regulatory_rule reg_rules_5g[] = {
|
|
const struct regulatory_rule reg_rules_5g[] = {
|
|
@@ -1286,6 +1309,16 @@ const struct regulatory_rule reg_rules_5g[] = {
|
|
[CHAN_5855_5875_1] = {5855, 5875, 20, 30, 0},
|
|
[CHAN_5855_5875_1] = {5855, 5875, 20, 30, 0},
|
|
[CHAN_5850_5925_1] = {5850, 5925, 20, 24, 0},
|
|
[CHAN_5850_5925_1] = {5850, 5925, 20, 24, 0},
|
|
[CHAN_5850_5925_2] = {5850, 5925, 20, 30, 0},
|
|
[CHAN_5850_5925_2] = {5850, 5925, 20, 30, 0},
|
|
|
|
+#ifdef CONFIG_BAND_6GHZ
|
|
|
|
+ [CHAN_5935_6435_1] = {5935, 6435, 160, 18, REGULATORY_CHAN_AFC},
|
|
|
|
+ [CHAN_5935_6435_2] = {5935, 6435, 160, 30, REGULATORY_CHAN_AFC},
|
|
|
|
+ [CHAN_6435_6535_1] = {6435, 6535, 160, 18, REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+ [CHAN_6435_6535_2] = {6435, 6535, 160, 24, REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+ [CHAN_6535_6875_1] = {6535, 6875, 160, 18, REGULATORY_CHAN_AFC},
|
|
|
|
+ [CHAN_6535_6875_2] = {6535, 6875, 160, 30, REGULATORY_CHAN_AFC},
|
|
|
|
+ [CHAN_6875_7115_1] = {6875, 7115, 160, 18, REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+ [CHAN_6875_7115_2] = {6875, 7115, 160, 24, REGULATORY_CHAN_INDOOR_ONLY},
|
|
|
|
+#endif
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
@@ -1341,6 +1374,33 @@ const struct regdomain regdomains_5g[] = {
|
|
CHAN_5490_5730_4,
|
|
CHAN_5490_5730_4,
|
|
CHAN_5735_5835_2} },
|
|
CHAN_5735_5835_2} },
|
|
|
|
|
|
|
|
+#ifdef CONFIG_BAND_6GHZ
|
|
|
|
+ [FCC15] = {CTL_FCC, DFS_FCC_REGION, 2, 0, 8, {CHAN_5170_5250_5,
|
|
|
|
+ CHAN_5250_5330_7,
|
|
|
|
+ CHAN_5490_5730_1,
|
|
|
|
+ CHAN_5735_5835_2,
|
|
|
|
+ CHAN_5935_6435_1,
|
|
|
|
+ CHAN_6435_6535_1,
|
|
|
|
+ CHAN_6535_6875_1,
|
|
|
|
+ CHAN_6875_7115_1} },
|
|
|
|
+
|
|
|
|
+ [FCC16] = {CTL_FCC, DFS_FCC_REGION, 2, 0, 8, {CHAN_5170_5250_4,
|
|
|
|
+ CHAN_5250_5330_7,
|
|
|
|
+ CHAN_5490_5730_1,
|
|
|
|
+ CHAN_5735_5835_2,
|
|
|
|
+ CHAN_5935_6435_2,
|
|
|
|
+ CHAN_6435_6535_2,
|
|
|
|
+ CHAN_6535_6875_2,
|
|
|
|
+ CHAN_6875_7115_2} },
|
|
|
|
+
|
|
|
|
+ [FCC17] = {CTL_FCC, DFS_FCC_REGION, 2, 0, 6, {CHAN_5170_5250_4,
|
|
|
|
+ CHAN_5250_5330_7,
|
|
|
|
+ CHAN_5490_5730_1,
|
|
|
|
+ CHAN_5735_5835_2,
|
|
|
|
+ CHAN_5935_6435_2,
|
|
|
|
+ CHAN_6535_6875_2} },
|
|
|
|
+#endif
|
|
|
|
+
|
|
[ETSI1] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_8,
|
|
[ETSI1] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_8,
|
|
CHAN_5250_5330_12,
|
|
CHAN_5250_5330_12,
|
|
CHAN_5490_5710_1} },
|
|
CHAN_5490_5710_1} },
|