summaryrefslogtreecommitdiff
path: root/db.txt.patch
blob: e88100aeaf3f8065eb4a8412dda4b176636db75c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
--- a/db.txt	2017-03-07 14:13:09.000000000 +0100
+++ b/db.txt	2017-04-16 14:53:01.930630453 +0200
@@ -1,18 +1,18 @@
 # This is the world regulatory domain
 country 00:
-	(2402 - 2472 @ 40), (20)
+	(2402 - 2472 @ 40), (30)
 	# Channel 12 - 13.
-	(2457 - 2482 @ 20), (20), NO-IR, AUTO-BW
+	(2457 - 2482 @ 20), (30), NO-IR, AUTO-BW
 	# Channel 14. Only JP enables this and for 802.11b only
-	(2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
+	(2474 - 2494 @ 20), (30), NO-IR, NO-OFDM
 	# Channel 36 - 48
-	(5170 - 5250 @ 80), (20), NO-IR, AUTO-BW
+	(5170 - 5250 @ 80), (30), NO-IR, AUTO-BW
 	# Channel 52 - 64
-	(5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW
+	(5250 - 5330 @ 80), (30), NO-IR, DFS, AUTO-BW
 	# Channel 100 - 144
-	(5490 - 5730 @ 160), (20), NO-IR, DFS
+	(5490 - 5730 @ 160), (30), NO-IR, DFS
 	# Channel 149 - 165
-	(5735 - 5835 @ 80), (20), NO-IR
+	(5735 - 5835 @ 80), (30), NO-IR
 	# IEEE 802.11ad (60GHz), channels 1..3
 	(57240 - 63720 @ 2160), (0)
 
@@ -385,12 +385,14 @@
 # 5GHz: https://erhvervsstyrelsen.dk/sites/default/files/007_interface-datanet_5-6_ghz.pdf.pdf
 # 60GHz: https://erhvervsstyrelsen.dk/sites/default/files/radiograenseflader-63.pdf
 country DK: DFS-ETSI
-	(2400 - 2483.5 @ 40), (20)
-	(5150 - 5250 @ 80), (23), AUTO-BW, wmmrule=ETSI
-	(5250 - 5350 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
-	(5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
-	# 60 GHz band channels 1-4 (ETSI EN 302 567)
-	(57000 - 66000 @ 2160), (40), NO-OUTDOOR
+       (2400 - 2483.5 @ 40), (30)
+       (5150 - 5250 @ 80), (30), NO-OUTDOOR, AUTO-BW
+       (5250 - 5350 @ 80), (30), NO-OUTDOOR, DFS, AUTO-BW
+       (5470 - 5725 @ 160), (30), DFS
+       (5725 - 5875 @ 80), (30)
+       # 60 GHz band channels 1-4 (ETSI EN 302 567)
+       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
+
 
 # Source:
 # http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55
@@ -481,12 +483,12 @@
 	(57000 - 66000 @ 2160), (40)
 
 country GB: DFS-ETSI
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
-	(5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
-	(5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
-	# 60 GHz band channels 1-4, ref: Etsi En 302 567
-	(57000 - 66000 @ 2160), (40)
+       (2402 - 2482 @ 40), (30)
+       (5170 - 5250 @ 80), (30), AUTO-BW
+       (5250 - 5330 @ 80), (30), DFS, AUTO-BW
+       (5490 - 5710 @ 160), (30), DFS
+       # 60 GHz band channels 1-4, ref: Etsi En 302 567
+       (57000 - 66000 @ 2160), (40)
 
 country GD: DFS-FCC
 	(2402 - 2472 @ 40), (30)
@@ -1216,9 +1216,9 @@
 country US: DFS-FCC
 	(2402 - 2472 @ 40), (30)
 	# 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients
-	(5170 - 5250 @ 80), (23), AUTO-BW
-	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
-	(5490 - 5730 @ 160), (23), DFS
+	(5170 - 5250 @ 80), (30), AUTO-BW
+	(5250 - 5330 @ 80), (30), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (30), DFS
 	(5735 - 5835 @ 80), (30)
 	# 60g band
 	# reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255