* [PATCH 0/8] wireless-regdb: General updates
@ 2013-11-01 13:55 Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 1/8] wireless-regdb: consolidate passive-scan and no-ibss flags Luis R. Rodriguez
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
John,
I have a pretty large delta now, this is due to the fact that
QCA has had a backlog of updates to wireless-regd for a while
now. We've worked on a tool to help automate interpretting our
rules and extracting them into wireless-regdb form. The hope here
is that after we iron our our discrepencies from the backlog we
will ensure that we'll be sending updates ASAP and that away
avoid any backlog.
There are a few discrepencies from what we have on countries
that the community has submitted changes on, in particular this
consists of: CZ, DE, ES, IL, RS, UA. For these countries I have
not submitted changes, and I am pending review with Michael
on the changes to see what we can come up with or compromise
on.
The first two patch series are completely augmentative in
the sense that we are only enabling HT40, VHT80, increasing
frequency ranges, increasing TX power on 2.4 and/or 5 GHz.
The last series does have general updates to countries which
do remove some rules but that is done only for countries not
listed above.
The entire delta can be obtained via either a single patch [0]
or my git tree [1].
This is the first patch set and deals with the initial backlog
I had, adds DFS regions to countries, and uses the new CRDA
optimizer for rules for which we have no pending conflicts
with.
I'll post details of the second and third patch set after the
first series patches. I expect a 4th patch set but I expect
that will take a bit of time to complete. This should be
enough to get us started back on the right track and try to
take care of as much of the backlog as possible.
[0] http://drvbp1.linux-foundation.org/~mcgrof/patches/2013/11/01/pending-wireless-regdb-2013-11-01.patch
[1] git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/wireless-regdb.git
Luis R. Rodriguez (8):
wireless-regdb: consolidate passive-scan and no-ibss flags
wireless-regdb: remove antenna gain
wireless-regdb: add DFS FCC regions
wireless-regdb: add DFS ETSI regions
wireless-regdb: add DFS JP regions
wireless-regdb: optimize two of DE's rules
wireless-regdb: optimize two of IL's rules
wireless-regdb: optimize two of NL's rules
db.txt | 1246 ++++++++++++++++++++++++++++++------------------------------
dbparse.py | 11 +-
2 files changed, 625 insertions(+), 632 deletions(-)
--
1.8.4.rc3
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/8] wireless-regdb: consolidate passive-scan and no-ibss flags
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 2/8] wireless-regdb: remove antenna gain Luis R. Rodriguez
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
These are used interchangeably so just do away
with the redundancy.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 8 ++++----
dbparse.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/db.txt b/db.txt
index d0d1a3f..b8ddb1b 100644
--- a/db.txt
+++ b/db.txt
@@ -2,14 +2,14 @@
country 00:
(2402 - 2472 @ 40), (3, 20)
# Channel 12 - 13.
- (2457 - 2482 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS
+ (2457 - 2482 @ 40), (3, 20), NO-IR
# Channel 14. Only JP enables this and for 802.11b only
- (2474 - 2494 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS, NO-OFDM
+ (2474 - 2494 @ 20), (3, 20), NO-IR, NO-OFDM
# Channel 36 - 48
- (5170 - 5250 @ 80), (3, 20), PASSIVE-SCAN, NO-IBSS
+ (5170 - 5250 @ 80), (3, 20), NO-IR
# NB: 5260 MHz - 5700 MHz requies DFS
# Channel 149 - 165
- (5735 - 5835 @ 80), (3, 20), PASSIVE-SCAN, NO-IBSS
+ (5735 - 5835 @ 80), (3, 20), NO-IR
# IEEE 802.11ad (60GHz), channels 1..3
(57240 - 63720 @ 2160), (N/A, 0)
diff --git a/dbparse.py b/dbparse.py
index 32cbce9..29eb9d6 100755
--- a/dbparse.py
+++ b/dbparse.py
@@ -12,8 +12,8 @@ flag_definitions = {
'DFS': 1<<4,
'PTP-ONLY': 1<<5,
'PTMP-ONLY': 1<<6,
- 'PASSIVE-SCAN': 1<<7,
- 'NO-IBSS': 1<<8,
+ 'NO-IR': 1<<7,
+ # hole at bit 8
# hole at bit 9. FIXME: Where is NO-HT40 defined?
'NO-HT40': 1<<10,
}
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/8] wireless-regdb: remove antenna gain
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 1/8] wireless-regdb: consolidate passive-scan and no-ibss flags Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 3/8] wireless-regdb: add DFS FCC regions Luis R. Rodriguez
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
This data is not accurate, cannot be relied upon given
that antenna gain is very specific to the device being
manufactured, and we never used it. Just kill it to
simplify the database.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 998 ++++++++++++++++++++++++++++++-------------------------------
dbparse.py | 7 +-
2 files changed, 501 insertions(+), 504 deletions(-)
diff --git a/db.txt b/db.txt
index b8ddb1b..c938767 100644
--- a/db.txt
+++ b/db.txt
@@ -1,211 +1,211 @@
# This is the world regulatory domain
country 00:
- (2402 - 2472 @ 40), (3, 20)
+ (2402 - 2472 @ 40), (20)
# Channel 12 - 13.
- (2457 - 2482 @ 40), (3, 20), NO-IR
+ (2457 - 2482 @ 40), (20), NO-IR
# Channel 14. Only JP enables this and for 802.11b only
- (2474 - 2494 @ 20), (3, 20), NO-IR, NO-OFDM
+ (2474 - 2494 @ 20), (20), NO-IR
# Channel 36 - 48
- (5170 - 5250 @ 80), (3, 20), NO-IR
+ (5170 - 5250 @ 80), (20), NO-IR
# NB: 5260 MHz - 5700 MHz requies DFS
# Channel 149 - 165
- (5735 - 5835 @ 80), (3, 20), NO-IR
+ (5735 - 5835 @ 80), (20), NO-IR
# IEEE 802.11ad (60GHz), channels 1..3
- (57240 - 63720 @ 2160), (N/A, 0)
+ (57240 - 63720 @ 2160), (0)
country AD:
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country AE:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country AL:
- (2402 - 2482 @ 20), (N/A, 20)
+ (2402 - 2482 @ 20), (20)
country AM:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (N/A, 18)
- (5250 - 5330 @ 20), (N/A, 18), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (18)
+ (5250 - 5330 @ 20), (18), DFS
country AN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
country AR:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country AT: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country AU:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country AW:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
country AZ:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 18)
- (5250 - 5330 @ 40), (N/A, 18), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (18)
+ (5250 - 5330 @ 40), (18), DFS
country BA: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country BB:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 23)
- (5250 - 5330 @ 40), (3, 23), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (23)
+ (5250 - 5330 @ 40), (23), DFS
+ (5735 - 5835 @ 40), (30)
country BD:
- (2402 - 2482 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
country BE: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country BG: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 23)
- (5250 - 5290 @ 40), (N/A, 23), DFS
- (5490 - 5710 @ 40), (N/A, 30), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (23)
+ (5250 - 5290 @ 40), (23), DFS
+ (5490 - 5710 @ 40), (30), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country BH:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (N/A, 20)
- (5250 - 5330 @ 20), (N/A, 20), DFS
- (5735 - 5835 @ 20), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (20)
+ (5250 - 5330 @ 20), (20), DFS
+ (5735 - 5835 @ 20), (20)
country BL:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 18)
- (5250 - 5330 @ 40), (N/A, 18), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (18)
+ (5250 - 5330 @ 40), (18), DFS
country BN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country BO:
- (2402 - 2482 @ 40), (N/A, 30)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (30)
+ (5735 - 5835 @ 40), (30)
country BR:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country BY:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
country BZ:
- (2402 - 2482 @ 40), (N/A, 30)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (30)
+ (5735 - 5835 @ 40), (30)
country CA:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country CH: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country CL:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5735 - 5835 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (20)
country CN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 80), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 80), (30)
# 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
# ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
- (57240 - 59400 @ 2160), (N/A, 28)
- (59400 - 63720 @ 2160), (N/A, 44)
- (63720 - 65880 @ 2160), (N/A, 28)
+ (57240 - 59400 @ 2160), (28)
+ (59400 - 63720 @ 2160), (44)
+ (63720 - 65880 @ 2160), (28)
country CO:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country CR:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country CY: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf
# and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf
# Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is
# implemented.
country CZ: DFS-ETSI
- (2400 - 2483.5 @ 40), (N/A, 100 mW)
- (5150 - 5250 @ 80), (N/A, 200 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (N/A, 100 mW), NO-OUTDOOR, DFS
- (5470 - 5725 @ 80), (N/A, 500 mW), DFS
+ (2400 - 2483.5 @ 40), (100 mW)
+ (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
+ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ (5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
# Data from "Frequenznutzungsplan" (as published in April 2008), downloaded from
# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38448/publicationFile/2659/Frequenznutzungsplan2008_Id17448pdf.pdf
@@ -221,542 +221,542 @@ country CZ: DFS-ETSI
country DE: DFS-ETSI
# entries 279004 and 280006
- (2400 - 2483.5 @ 40), (N/A, 100 mW)
+ (2400 - 2483.5 @ 40), (100 mW)
# entry 303005
- (5150 - 5250 @ 80), (N/A, 100 mW), NO-OUTDOOR
+ (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
# entries 304002 and 305002
- (5250 - 5350 @ 80), (N/A, 100 mW), NO-OUTDOOR, DFS
+ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
# entries 308002, 309001 and 310003
- (5470 - 5725 @ 80), (N/A, 500 mW), DFS
+ (5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country DK: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country DO:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 23), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (23), DFS
+ (5735 - 5835 @ 40), (30)
country DZ:
- (2402 - 2482 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
country EC:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country EE: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country EG:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (N/A, 20)
- (5250 - 5330 @ 20), (N/A, 20), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (20)
+ (5250 - 5330 @ 20), (20), DFS
country ES: DFS-ETSI
- (2400 - 2483.5 @ 40), (N/A, 100 mW)
- (5150 - 5250 @ 80), (N/A, 100 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (N/A, 100 mW), NO-OUTDOOR, DFS
- (5470 - 5725 @ 80), (N/A, 500 mW), DFS
+ (2400 - 2483.5 @ 40), (100 mW)
+ (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
+ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ (5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country FI: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country FR: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country GE:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 18)
- (5250 - 5330 @ 40), (N/A, 18), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (18)
+ (5250 - 5330 @ 40), (18), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country GB: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country GD:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country GR: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country GL: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (N/A, 20)
- (5250 - 5330 @ 20), (N/A, 20), DFS
- (5490 - 5710 @ 20), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (20)
+ (5250 - 5330 @ 20), (20), DFS
+ (5490 - 5710 @ 20), (27), DFS
country GT:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 23), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (23), DFS
+ (5735 - 5835 @ 40), (30)
country GU:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country HN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country HK:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country HR: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country HT:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
country HU: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country ID:
# ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5815 @ 80), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5815 @ 80), (20)
country IE: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country IL:
- (2402 - 2482 @ 40), (N/A, 20)
- (5150 - 5250 @ 80), (N/A, 200 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (N/A, 200 mW), NO-OUTDOOR, DFS
+ (2402 - 2482 @ 40), (20)
+ (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
+ (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
country IN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5735 - 5835 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (20)
country IS: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country IR:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country IT: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country JM:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country JP:
- (2402 - 2482 @ 40), (N/A, 20)
- (2474 - 2494 @ 20), (N/A, 20), NO-OFDM
- (4910 - 4990 @ 40), (N/A, 23)
- (5030 - 5090 @ 40), (N/A, 23)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 160), (N/A, 23), DFS
+ (2402 - 2482 @ 40), (20)
+ (2474 - 2494 @ 20), (20), NO-OFDM
+ (4910 - 4990 @ 40), (23)
+ (5030 - 5090 @ 40), (23)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 160), (23), DFS
country JO:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 18)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (18)
country KE:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country KH:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
country KP:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5330 @ 40), (3, 20)
- (5160 - 5250 @ 40), (3, 20), DFS
- (5490 - 5630 @ 40), (3, 30), DFS
- (5735 - 5815 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5330 @ 40), (20)
+ (5160 - 5250 @ 40), (20), DFS
+ (5490 - 5630 @ 40), (30), DFS
+ (5735 - 5815 @ 40), (30)
country KR:
- (2402 - 2482 @ 20), (N/A, 20)
- (5170 - 5250 @ 80), (3, 20)
- (5250 - 5330 @ 80), (3, 20), DFS
- (5490 - 5630 @ 80), (3, 30), DFS
- (5735 - 5815 @ 80), (3, 30)
+ (2402 - 2482 @ 20), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5630 @ 80), (30), DFS
+ (5735 - 5815 @ 80), (30)
country KW:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
country KZ:
- (2402 - 2482 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
country LB:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country LI: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
country LK:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (3, 17)
- (5250 - 5330 @ 20), (3, 20), DFS
- (5490 - 5710 @ 20), (3, 20), DFS
- (5735 - 5835 @ 20), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (20), DFS
+ (5490 - 5710 @ 20), (20), DFS
+ (5735 - 5835 @ 20), (30)
country LT: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country LU: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country LV: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country MC: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 18)
- (5250 - 5330 @ 40), (N/A, 18), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (18)
+ (5250 - 5330 @ 40), (18), DFS
country MA:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 23)
- (5735 - 5835 @ 80), (N/A, 23)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (23)
+ (5735 - 5835 @ 80), (23)
country MO:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 23)
- (5250 - 5330 @ 40), (3, 23), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (23)
+ (5250 - 5330 @ 40), (23), DFS
+ (5735 - 5835 @ 40), (30)
country MK: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country MT: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country MY:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 17)
- (5250 - 5330 @ 80), (N/A, 23), DFS
- (5735 - 5835 @ 80), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (23), DFS
+ (5735 - 5835 @ 80), (30)
country MX:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country NL: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20), NO-OUTDOOR
- (5250 - 5330 @ 80), (N/A, 20), NO-OUTDOOR, DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20), NO-OUTDOOR
+ (5250 - 5330 @ 80), (20), NO-OUTDOOR
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country NO: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country NP:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country NZ:
- (2402 - 2482 @ 40), (N/A, 30)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (30)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country OM:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country PA:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 23), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (23), DFS
+ (5735 - 5835 @ 40), (30)
country PE:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country PG:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 23), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (23), DFS
+ (5735 - 5835 @ 40), (30)
country PH:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country PK:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country PL: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country PT: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country PR:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country QA:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country RO: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
# Source:
# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
country RS:
- (2400 - 2483.5 @ 40), (N/A, 100 mW)
- (5150 - 5350 @ 40), (N/A, 200 mW), NO-OUTDOOR
- (5470 - 5725 @ 20), (3, 1000 mW), DFS
+ (2400 - 2483.5 @ 40), (100 mW)
+ (5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
+ (5470 - 5725 @ 20), (1000 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country RU:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5330 @ 40), (N/A, 20)
- (5650 - 5710 @ 40), (N/A, 30)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5330 @ 40), (20)
+ (5650 - 5710 @ 40), (30)
+ (5735 - 5835 @ 40), (30)
country RW:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 40), (N/A, 30)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 40), (30)
country SA:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country SE: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country SG:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country SI: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (N/A, 20)
- (5250 - 5330 @ 40), (N/A, 20), DFS
- (5490 - 5710 @ 40), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country SK: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country SV:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (3, 17)
- (5250 - 5330 @ 20), (3, 23), DFS
- (5735 - 5835 @ 20), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (23), DFS
+ (5735 - 5835 @ 20), (30)
country SY:
- (2402 - 2482 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
country TW:
- (2402 - 2472 @ 40), (3, 27)
- (5270 - 5330 @ 40), (3, 17), DFS
- (5490 - 5710 @ 80), (3, 30), DFS
- (5735 - 5815 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5270 - 5330 @ 40), (17), DFS
+ (5490 - 5710 @ 80), (30), DFS
+ (5735 - 5815 @ 80), (30)
country TH:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country TT:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country TN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (N/A, 20)
- (5250 - 5330 @ 20), (N/A, 20), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 20), (20)
+ (5250 - 5330 @ 20), (20), DFS
country TR: DFS-ETSI
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (N/A, 20)
- (5250 - 5330 @ 80), (N/A, 20), DFS
- (5490 - 5710 @ 80), (N/A, 27), DFS
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
# Source:
# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
@@ -766,58 +766,58 @@ country TR: DFS-ETSI
# rules in the referenced laws. Such a range is used because of
# disputable definitions there.
country UA:
- (2400 - 2483.5 @ 40), (N/A, 20), NO-OUTDOOR
- (5150 - 5350 @ 40), (N/A, 20), NO-OUTDOOR
+ (2400 - 2483.5 @ 40), (20), NO-OUTDOOR
+ (5150 - 5350 @ 40), (20), NO-OUTDOOR
# 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country US: DFS-FCC
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5600 @ 80), (3, 24), DFS
- (5650 - 5710 @ 40), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5600 @ 80), (24), DFS
+ (5650 - 5710 @ 40), (24), DFS
+ (5735 - 5835 @ 80), (30)
# 60g band
# reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255
# channels 1,2,3, EIRP=40dBm(43dBm peak)
- (57240 - 63720 @ 2160), (N/A, 40)
+ (57240 - 63720 @ 2160), (40)
country UY:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country UZ:
- (2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 40), (3, 17)
- (5250 - 5330 @ 40), (3, 20), DFS
- (5490 - 5710 @ 40), (3, 20), DFS
- (5735 - 5835 @ 40), (3, 30)
+ (2402 - 2472 @ 40), (27)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (20), DFS
+ (5735 - 5835 @ 40), (30)
country VE:
- (2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5815 @ 40), (N/A, 23)
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5815 @ 40), (23)
country VN:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country YE:
- (2402 - 2482 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
country ZA:
- (2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5710 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country ZW:
- (2402 - 2482 @ 40), (N/A, 20)
+ (2402 - 2482 @ 40), (20)
diff --git a/dbparse.py b/dbparse.py
index 29eb9d6..ac7234b 100755
--- a/dbparse.py
+++ b/dbparse.py
@@ -205,13 +205,10 @@ class DBParser(object):
def _parse_power_def(self, pname, line, dupwarn=True):
try:
- (max_ant_gain,
- max_eirp) = line.split(',')
- if max_ant_gain == 'N/A':
- max_ant_gain = '0'
+ max_eirp = line
if max_eirp == 'N/A':
max_eirp = '0'
- max_ant_gain = float(max_ant_gain)
+ max_ant_gain = float(0)
def conv_pwr(pwr):
if pwr.endswith('mW'):
pwr = float(pwr[:-2])
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/8] wireless-regdb: add DFS FCC regions
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 1/8] wireless-regdb: consolidate passive-scan and no-ibss flags Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 2/8] wireless-regdb: remove antenna gain Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 4/8] wireless-regdb: add DFS ETSI regions Luis R. Rodriguez
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
This associates the following countries to the
DFS FCC region:
AE, AR, BB, BR, CA, CN, CO, CR, DO, EC,
GD, GT, GU, HN, JM, LB, LK, MY, MX, NZ,
PA, PE, PG, PH, PR, RW, SG, SV, TH, TT,
UY, UZ, VE, VN
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 68 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/db.txt b/db.txt
index c938767..94da96a 100644
--- a/db.txt
+++ b/db.txt
@@ -18,7 +18,7 @@ country AD:
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country AE:
+country AE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -39,7 +39,7 @@ country AN:
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country AR:
+country AR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -80,7 +80,7 @@ country BA: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country BB:
+country BB: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (23)
(5250 - 5330 @ 40), (23), DFS
@@ -126,7 +126,7 @@ country BO:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country BR:
+country BR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -143,7 +143,7 @@ country BZ:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country CA:
+country CA: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -164,7 +164,7 @@ country CL:
(5250 - 5330 @ 40), (20), DFS
(5735 - 5835 @ 40), (20)
-country CN:
+country CN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 80), (30)
# 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
@@ -173,14 +173,14 @@ country CN:
(59400 - 63720 @ 2160), (44)
(63720 - 65880 @ 2160), (28)
-country CO:
+country CO: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country CR:
+country CR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -239,7 +239,7 @@ country DK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country DO:
+country DO: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
@@ -248,7 +248,7 @@ country DO:
country DZ:
(2402 - 2482 @ 40), (20)
-country EC:
+country EC: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -307,7 +307,7 @@ country GB: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country GD:
+country GD: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -328,20 +328,20 @@ country GL: DFS-ETSI
(5250 - 5330 @ 20), (20), DFS
(5490 - 5710 @ 20), (27), DFS
-country GT:
+country GT: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country GU:
+country GU: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country HN:
+country HN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -421,7 +421,7 @@ country IT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country JM:
+country JM: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -473,7 +473,7 @@ country KW:
country KZ:
(2402 - 2482 @ 40), (20)
-country LB:
+country LB: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -483,7 +483,7 @@ country LI: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country LK:
+country LK: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (17)
(5250 - 5330 @ 20), (20), DFS
@@ -546,13 +546,13 @@ country MT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country MY:
+country MY: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (23), DFS
(5735 - 5835 @ 80), (30)
-country MX:
+country MX: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -579,7 +579,7 @@ country NP:
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country NZ:
+country NZ: DFS-FCC
(2402 - 2482 @ 40), (30)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -593,26 +593,26 @@ country OM:
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country PA:
+country PA: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country PE:
+country PE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country PG:
+country PG: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country PH:
+country PH: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -639,7 +639,7 @@ country PT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country PR:
+country PR: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -674,7 +674,7 @@ country RU:
(5650 - 5710 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country RW:
+country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -693,7 +693,7 @@ country SE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country SG:
+country SG: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -716,7 +716,7 @@ country SK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country SV:
+country SV: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (17)
(5250 - 5330 @ 20), (23), DFS
@@ -731,14 +731,14 @@ country TW:
(5490 - 5710 @ 80), (30), DFS
(5735 - 5815 @ 80), (30)
-country TH:
+country TH: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country TT:
+country TT: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -783,25 +783,25 @@ country US: DFS-FCC
# channels 1,2,3, EIRP=40dBm(43dBm peak)
(57240 - 63720 @ 2160), (40)
-country UY:
+country UY: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country UZ:
+country UZ: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country VE:
+country VE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5815 @ 40), (23)
-country VN:
+country VN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/8] wireless-regdb: add DFS ETSI regions
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
` (2 preceding siblings ...)
2013-11-01 13:55 ` [PATCH 3/8] wireless-regdb: add DFS FCC regions Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 5/8] wireless-regdb: add DFS JP regions Luis R. Rodriguez
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
This associates the following countries to the
DFS ETSI region:
AL, AM, AN, AW, AZ, BY, EG, GE, HT,
IL, KH, KW, MA, OM, RS, RU, SA, TN,
UA, ZA, ZW
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/db.txt b/db.txt
index 94da96a..beb94fd 100644
--- a/db.txt
+++ b/db.txt
@@ -25,15 +25,15 @@ country AE: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country AL:
+country AL: DFS-ETSI
(2402 - 2482 @ 20), (20)
-country AM:
+country AM: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (18)
(5250 - 5330 @ 20), (18), DFS
-country AN:
+country AN: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -61,13 +61,13 @@ country AU:
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country AW:
+country AW: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country AZ:
+country AZ: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
@@ -133,7 +133,7 @@ country BR: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country BY:
+country BY: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -263,7 +263,7 @@ country EE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country EG:
+country EG: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -292,7 +292,7 @@ country FR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country GE:
+country GE: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
@@ -363,7 +363,7 @@ country HR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country HT:
+country HT: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -390,7 +390,7 @@ country IE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country IL:
+country IL: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
@@ -445,7 +445,7 @@ country KE:
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country KH:
+country KH: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -465,7 +465,7 @@ country KR:
(5490 - 5630 @ 80), (30), DFS
(5735 - 5815 @ 80), (30)
-country KW:
+country KW: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
(5250 - 5330 @ 80), (20), DFS
@@ -519,7 +519,7 @@ country MC: DFS-ETSI
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
-country MA:
+country MA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (23)
(5735 - 5835 @ 80), (23)
@@ -586,7 +586,7 @@ country NZ: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country OM:
+country OM: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -661,14 +661,14 @@ country RO: DFS-ETSI
# Source:
# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
-country RS:
+country RS: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
(5470 - 5725 @ 20), (1000 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country RU:
+country RU: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5330 @ 40), (20)
(5650 - 5710 @ 40), (30)
@@ -678,7 +678,7 @@ country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country SA:
+country SA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -745,7 +745,7 @@ country TT: DFS-FCC
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country TN:
+country TN: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -765,7 +765,7 @@ country TR: DFS-ETSI
# Listed 5GHz range is a lowest common denominator for all related
# rules in the referenced laws. Such a range is used because of
# disputable definitions there.
-country UA:
+country UA: DFS-ETSI
(2400 - 2483.5 @ 40), (20), NO-OUTDOOR
(5150 - 5350 @ 40), (20), NO-OUTDOOR
# 60 gHz band channels 1-4, ref: Etsi En 302 567
@@ -811,13 +811,13 @@ country VN: DFS-FCC
country YE:
(2402 - 2482 @ 40), (20)
-country ZA:
+country ZA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country ZW:
+country ZW: DFS-ETSI
(2402 - 2482 @ 40), (20)
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/8] wireless-regdb: add DFS JP regions
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
` (3 preceding siblings ...)
2013-11-01 13:55 ` [PATCH 4/8] wireless-regdb: add DFS ETSI regions Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 6/8] wireless-regdb: optimize two of DE's rules Luis R. Rodriguez
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
This associates the following countries to the
DFS JP region:
BD, BH, BN, BO, BZ, CL, DZ, ID, IN, IR
JP, JO, KE, KP, KR, NP, PK, QA, TW
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/db.txt b/db.txt
index beb94fd..ec3bee6 100644
--- a/db.txt
+++ b/db.txt
@@ -86,7 +86,7 @@ country BB: DFS-FCC
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country BD:
+country BD: DFS-JP
(2402 - 2482 @ 40), (20)
country BE: DFS-ETSI
@@ -105,7 +105,7 @@ country BG: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country BH:
+country BH: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -116,13 +116,13 @@ country BL:
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
-country BN:
+country BN: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country BO:
+country BO: DFS-JP
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
@@ -139,7 +139,7 @@ country BY: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country BZ:
+country BZ: DFS-JP
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
@@ -158,7 +158,7 @@ country CH: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country CL:
+country CL: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -245,7 +245,7 @@ country DO: DFS-FCC
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country DZ:
+country DZ: DFS-JP
(2402 - 2482 @ 40), (20)
country EC: DFS-FCC
@@ -377,7 +377,7 @@ country HU: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country ID:
+country ID: DFS-JP
# ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
(2402 - 2482 @ 40), (20)
(5735 - 5815 @ 80), (20)
@@ -395,7 +395,7 @@ country IL: DFS-ETSI
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
-country IN:
+country IN: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -409,7 +409,7 @@ country IS: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country IR:
+country IR: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -428,7 +428,7 @@ country JM: DFS-FCC
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country JP:
+country JP: DFS-JP
(2402 - 2482 @ 40), (20)
(2474 - 2494 @ 20), (20), NO-OFDM
(4910 - 4990 @ 40), (23)
@@ -437,11 +437,11 @@ country JP:
(5250 - 5330 @ 80), (20), DFS
(5490 - 5710 @ 160), (23), DFS
-country JO:
+country JO: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
-country KE:
+country KE: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -451,14 +451,14 @@ country KH: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country KP:
+country KP: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5330 @ 40), (20)
(5160 - 5250 @ 40), (20), DFS
(5490 - 5630 @ 40), (30), DFS
(5735 - 5815 @ 40), (30)
-country KR:
+country KR: DFS-JP
(2402 - 2482 @ 20), (20)
(5170 - 5250 @ 80), (20)
(5250 - 5330 @ 80), (20), DFS
@@ -575,7 +575,7 @@ country NO: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country NP:
+country NP: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -619,7 +619,7 @@ country PH: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country PK:
+country PK: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -646,7 +646,7 @@ country PR: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country QA:
+country QA: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -725,7 +725,7 @@ country SV: DFS-FCC
country SY:
(2402 - 2482 @ 40), (20)
-country TW:
+country TW: DFS-JP
(2402 - 2472 @ 40), (27)
(5270 - 5330 @ 40), (17), DFS
(5490 - 5710 @ 80), (30), DFS
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/8] wireless-regdb: optimize two of DE's rules
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
` (4 preceding siblings ...)
2013-11-01 13:55 ` [PATCH 5/8] wireless-regdb: add DFS JP regions Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 19:41 ` Johannes Berg
2013-11-01 13:55 ` [PATCH 7/8] wireless-regdb: optimize two of IL's rules Luis R. Rodriguez
` (2 subsequent siblings)
8 siblings, 1 reply; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/db.txt b/db.txt
index ec3bee6..22b6561 100644
--- a/db.txt
+++ b/db.txt
@@ -222,10 +222,8 @@ country CZ: DFS-ETSI
country DE: DFS-ETSI
# entries 279004 and 280006
(2400 - 2483.5 @ 40), (100 mW)
- # entry 303005
- (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
- # entries 304002 and 305002
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ # entry 303005, 304002 and 305002
+ (5150 - 5350 @ 80), (100 mW), NO-OUTDOOR
# entries 308002, 309001 and 310003
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/8] wireless-regdb: optimize two of IL's rules
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
` (5 preceding siblings ...)
2013-11-01 13:55 ` [PATCH 6/8] wireless-regdb: optimize two of DE's rules Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 8/8] wireless-regdb: optimize two of NL's rules Luis R. Rodriguez
2013-11-01 16:04 ` [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/db.txt b/db.txt
index 22b6561..ddfbc04 100644
--- a/db.txt
+++ b/db.txt
@@ -390,8 +390,7 @@ country IE: DFS-ETSI
country IL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
+ (5150 - 5350 @ 80), (200 mW), NO-OUTDOOR
country IN: DFS-JP
(2402 - 2482 @ 40), (20)
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 8/8] wireless-regdb: optimize two of NL's rules
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
` (6 preceding siblings ...)
2013-11-01 13:55 ` [PATCH 7/8] wireless-regdb: optimize two of IL's rules Luis R. Rodriguez
@ 2013-11-01 13:55 ` Luis R. Rodriguez
2013-11-01 16:04 ` [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 13:55 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/db.txt b/db.txt
index ddfbc04..11e0cb8 100644
--- a/db.txt
+++ b/db.txt
@@ -558,8 +558,7 @@ country MX: DFS-FCC
country NL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), NO-OUTDOOR
- (5250 - 5330 @ 80), (20), NO-OUTDOOR
+ (5170 - 5330 @ 80), (20), NO-OUTDOOR
(5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/8] wireless-regdb: General updates
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
` (7 preceding siblings ...)
2013-11-01 13:55 ` [PATCH 8/8] wireless-regdb: optimize two of NL's rules Luis R. Rodriguez
@ 2013-11-01 16:04 ` Luis R. Rodriguez
8 siblings, 0 replies; 11+ messages in thread
From: Luis R. Rodriguez @ 2013-11-01 16:04 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless, wireless-regdb@lists.infradead.org,
Luis R. Rodriguez
On Fri, Nov 1, 2013 at 2:55 PM, Luis R. Rodriguez
<mcgrof@do-not-panic.com> wrote:
> The entire delta can be obtained via either a single patch [0]
> or my git tree [1].
Since I provided a patch update fix I pushed the changes to the git
tree and provided a new v2 all-in-one patch [2] as well.
[2] http://drvbp1.linux-foundation.org/~mcgrof/patches/2013/11/01/pending-wireless-regdb-2013-11-01-v2.patch
Luis
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 6/8] wireless-regdb: optimize two of DE's rules
2013-11-01 13:55 ` [PATCH 6/8] wireless-regdb: optimize two of DE's rules Luis R. Rodriguez
@ 2013-11-01 19:41 ` Johannes Berg
0 siblings, 0 replies; 11+ messages in thread
From: Johannes Berg @ 2013-11-01 19:41 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linville, linux-wireless, wireless-regdb
On Fri, 2013-11-01 at 14:55 +0100, Luis R. Rodriguez wrote:
> - # entry 303005
> - (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
> - # entries 304002 and 305002
> - (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
> + # entry 303005, 304002 and 305002
should probably say entries :)
Btw, according to the formal definition that the kernel uses, having two
versus one rule actually *is* different. Having two stops you from using
a channel that crosses the boundary. In practice, this kind of
interpretation is actually cumbersome and error-prone, which I've
pointed out long ago together with my suggestion to actually change it,
but I wanted to point it out anyway.
johannes
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-11-01 19:41 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-01 13:55 [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 1/8] wireless-regdb: consolidate passive-scan and no-ibss flags Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 2/8] wireless-regdb: remove antenna gain Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 3/8] wireless-regdb: add DFS FCC regions Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 4/8] wireless-regdb: add DFS ETSI regions Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 5/8] wireless-regdb: add DFS JP regions Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 6/8] wireless-regdb: optimize two of DE's rules Luis R. Rodriguez
2013-11-01 19:41 ` Johannes Berg
2013-11-01 13:55 ` [PATCH 7/8] wireless-regdb: optimize two of IL's rules Luis R. Rodriguez
2013-11-01 13:55 ` [PATCH 8/8] wireless-regdb: optimize two of NL's rules Luis R. Rodriguez
2013-11-01 16:04 ` [PATCH 0/8] wireless-regdb: General updates Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).