mac80211: update regdb.txt

This was copied from wireless-regdb.git commit a14052b85e5d70e37a31962a9c56c0cdbb9acafc

The passive-scan/no-ibss flag of channels 36-48 in the world regd were
removed like it was done in r32126.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38797

diff --git a/package/kernel/mac80211/files/regdb.txt b/package/kernel/mac80211/files/regdb.txt
index b250e6926e6c8884315918aa8e0a7d6bf2a42abd..2badb21c451169ab87e92b7f8b9cf02c841afa66 100644 (file)
--- a/package/kernel/mac80211/files/regdb.txt
+++ b/package/kernel/mac80211/files/regdb.txt
@@ -1,22 +1,29 @@
 # This is the world regulatory domain
 country 00:
        (2402 - 2472 @ 40), (3, 20)
-        # Channel 12 - 13. No HT40 channel fits here
-        (2457 - 2482 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS
-        # Channel 14. Only JP enables this and for 802.11b only
-        (2474 - 2494 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS, NO-OFDM
-        # Channel 36 - 48
-        (5170 - 5250 @ 40), (3, 20)
-        # NB: 5260 MHz - 5700 MHz requies DFS
-        # Channel 149 - 165
-        (5735 - 5835 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS
-
+       # Channel 12 - 13.
+       (2457 - 2482 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS
+       # Channel 14. Only JP enables this and for 802.11b only
+       (2474 - 2494 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS, NO-OFDM
+       # Channel 36 - 48
+       (5170 - 5250 @ 80), (3, 20)
+       # NB: 5260 MHz - 5700 MHz requies DFS
+       # Channel 149 - 165
+       (5735 - 5835 @ 80), (3, 20), PASSIVE-SCAN, NO-IBSS
+       # IEEE 802.11ad (60GHz), channels 1..3
+       (57240 - 63720 @ 2160), (N/A, 0)
+
+
+country AD:
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country AE:
        (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
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country AL:
        (2402 - 2482 @ 20), (N/A, 20)
@@ -34,22 +41,25 @@ country AN:
 
 country AR:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country AT: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country AU:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 40), (3, 23)
-       (5250 - 5330 @ 40), (3, 23), DFS
-       (5735 - 5835 @ 40), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country AW:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -67,6 +77,8 @@ country BA: DFS-ETSI
        (5170 - 5250 @ 40), (N/A, 20)
        (5250 - 5330 @ 40), (N/A, 20), DFS
        (5490 - 5710 @ 40), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country BB:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -79,15 +91,19 @@ country BD:
 
 country BE: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country BH:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -112,10 +128,10 @@ country BO:
 
 country BR:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country BY:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -129,16 +145,18 @@ country BZ:
 
 country CA:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country CH: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country CL:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -148,31 +166,34 @@ country CL:
 
 country CN:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5735 - 5835 @ 40), (N/A, 30)
+       (5735 - 5835 @ 80), (N/A, 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)
 
 country CO:
        (2402 - 2472 @ 40), (3, 27)
-       (5170 - 5250 @ 40), (3, 17)
-       (5250 - 5330 @ 40), (3, 23), DFS
-       (5735 - 5835 @ 40), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country CR:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 20), (3, 17)
-       (5250 - 5330 @ 20), (3, 23), DFS
-       (5735 - 5835 @ 20), (3, 30)
-
-country CS:
-       (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
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
@@ -180,9 +201,11 @@ country CY: DFS-ETSI
 # implemented.
 country CZ: DFS-ETSI
        (2400 - 2483.5 @ 40), (N/A, 100 mW)
-       (5150 - 5250 @ 40), (N/A, 200 mW), NO-OUTDOOR
-       (5250 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS
-       (5470 - 5725 @ 40), (N/A, 500 mW), DFS
+       (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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
@@ -200,17 +223,21 @@ country DE: DFS-ETSI
        # entries 279004 and 280006
        (2400 - 2483.5 @ 40), (N/A, 100 mW)
        # entry 303005
-       (5150 - 5250 @ 40), (N/A, 100 mW), NO-OUTDOOR
+       (5150 - 5250 @ 80), (N/A, 100 mW), NO-OUTDOOR
        # entries 304002 and 305002
-       (5250 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS
+       (5250 - 5350 @ 80), (N/A, 100 mW), NO-OUTDOOR, DFS
        # entries 308002, 309001 and 310003
-       (5470 - 5725 @ 40), (N/A, 500 mW), DFS
+       (5470 - 5725 @ 80), (N/A, 500 mW), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country DK: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country DO:
        (2402 - 2472 @ 40), (3, 27)
@@ -223,15 +250,18 @@ country DZ:
 
 country EC:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 20), (3, 17)
-       (5250 - 5330 @ 20), (3, 23), DFS
-       (5735 - 5835 @ 20), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country EG:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -239,33 +269,43 @@ country EG:
        (5250 - 5330 @ 20), (N/A, 20), DFS
 
 country ES: 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
+       (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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country FI: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country FR: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country GE:
        (2402 - 2482 @ 40), (N/A, 20)
        (5170 - 5250 @ 40), (N/A, 18)
        (5250 - 5330 @ 40), (N/A, 18), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country GB: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country GD:
        (2402 - 2472 @ 40), (3, 27)
@@ -276,9 +316,11 @@ country GD:
 
 country GR: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country GL: DFS-ETSI
        (2402 - 2482 @ 40), (N/A, 20)
@@ -294,9 +336,10 @@ country GT:
 
 country GU:
        (2402 - 2472 @ 40), (3, 27)
-       (5170 - 5250 @ 20), (3, 17)
-       (5250 - 5330 @ 20), (3, 23), DFS
-       (5735 - 5835 @ 20), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country HN:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -307,16 +350,18 @@ country HN:
 
 country HK:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country HT:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -329,20 +374,26 @@ country HU: DFS-ETSI
        (5170 - 5250 @ 40), (N/A, 20)
        (5250 - 5330 @ 40), (N/A, 20), DFS
        (5490 - 5710 @ 40), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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)
 
 country IE: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country IL:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5150 - 5250 @ 40), (N/A, 200 mW), NO-OUTDOOR
-       (5250 - 5350 @ 40), (N/A, 200 mW), NO-OUTDOOR, DFS
+       (5150 - 5250 @ 80), (N/A, 200 mW), NO-OUTDOOR
+       (5250 - 5350 @ 80), (N/A, 200 mW), NO-OUTDOOR, DFS
 
 country IN:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -355,6 +406,8 @@ country IS: DFS-ETSI
        (5170 - 5250 @ 40), (N/A, 20)
        (5250 - 5330 @ 40), (N/A, 20), DFS
        (5490 - 5710 @ 40), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country IR:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -362,9 +415,11 @@ country IR:
 
 country IT: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country JM:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -374,18 +429,13 @@ country JM:
        (5735 - 5835 @ 40), (3, 30)
 
 country JP:
-       (2402 - 2472 @ 40), (N/A, 20)
-       (2457 - 2482 @ 20), (N/A, 20)
+       (2402 - 2482 @ 40), (N/A, 20)
        (2474 - 2494 @ 20), (N/A, 20), NO-OFDM
-       (4910 - 4930 @ 10), (N/A, 23)
        (4910 - 4990 @ 40), (N/A, 23)
-       (4930 - 4950 @ 10), (N/A, 23)
-       (5030 - 5045 @ 10), (N/A, 23)
        (5030 - 5090 @ 40), (N/A, 23)
-       (5050 - 5060 @ 10), (N/A, 23)
-       (5170 - 5250 @ 40), (N/A, 20)
-       (5250 - 5330 @ 40), (N/A, 20), DFS
-       (5490 - 5710 @ 40), (N/A, 23), DFS
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 160), (N/A, 23), DFS
 
 country JO:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -410,15 +460,15 @@ country KP:
 
 country KR:
        (2402 - 2482 @ 20), (N/A, 20)
-       (5170 - 5250 @ 20), (3, 20)
-       (5250 - 5330 @ 20), (3, 20), DFS
-       (5490 - 5630 @ 20), (3, 30), DFS
-       (5735 - 5815 @ 20), (3, 30)
+       (5170 - 5250 @ 80), (3, 20)
+       (5250 - 5330 @ 80), (3, 20), DFS
+       (5490 - 5630 @ 80), (3, 30), DFS
+       (5735 - 5815 @ 80), (3, 30)
 
 country KW:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 40), (N/A, 20)
-       (5250 - 5330 @ 40), (N/A, 20), DFS
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
 
 country KZ:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -445,18 +495,24 @@ country LT: DFS-ETSI
        (5170 - 5250 @ 40), (N/A, 20)
        (5250 - 5330 @ 40), (N/A, 20), DFS
        (5490 - 5710 @ 40), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country LU: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country MC: DFS-ETSI
        (2402 - 2482 @ 40), (N/A, 20)
@@ -465,6 +521,8 @@ country MC: DFS-ETSI
 
 country MA:
        (2402 - 2482 @ 40), (N/A, 20)
+       (5170 - 5250 @ 80), (N/A, 23)
+       (5735 - 5835 @ 80), (N/A, 23)
 
 country MO:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -477,35 +535,45 @@ country MK: DFS-ETSI
        (5170 - 5250 @ 40), (N/A, 20)
        (5250 - 5330 @ 40), (N/A, 20), DFS
        (5490 - 5710 @ 40), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country MY:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5250 - 5330 @ 40), (N/A, 30), DFS
-       (5735 - 5835 @ 40), (N/A, 30)
+       (5170 - 5250 @ 80), (N/A, 17)
+       (5250 - 5330 @ 80), (N/A, 23), DFS
+       (5735 - 5835 @ 80), (N/A, 30)
 
 country MX:
        (2402 - 2472 @ 40), (3, 27)
-       (5170 - 5250 @ 40), (3, 17)
-       (5250 - 5330 @ 40), (3, 23), DFS
-       (5735 - 5835 @ 40), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country NL: DFS-ETSI
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 40), (N/A, 20), NO-OUTDOOR
-       (5250 - 5330 @ 40), (N/A, 20), NO-OUTDOOR, DFS
-       (5490 - 5710 @ 40), (N/A, 27), DFS
+       (5170 - 5250 @ 80), (N/A, 20), NO-OUTDOOR
+       (5250 - 5330 @ 80), (N/A, 20), NO-OUTDOOR, DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country NP:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -513,9 +581,10 @@ country NP:
 
 country NZ:
        (2402 - 2482 @ 40), (N/A, 30)
-       (5170 - 5250 @ 20), (3, 23)
-       (5250 - 5330 @ 20), (3, 23), DFS
-       (5735 - 5835 @ 20), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country OM:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -532,7 +601,10 @@ country PA:
 
 country PE:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5735 - 5835 @ 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)
 
 country PG:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -542,7 +614,10 @@ country PG:
 
 country PH:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5735 - 5835 @ 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)
 
 country PK:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -550,21 +625,26 @@ country PK:
 
 country PL: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country PT: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country PR:
        (2402 - 2472 @ 40), (3, 27)
-       (5170 - 5250 @ 40), (3, 17)
-       (5250 - 5330 @ 40), (3, 23), DFS
-       (5735 - 5835 @ 40), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country QA:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -575,40 +655,66 @@ country RO: DFS-ETSI
        (5170 - 5250 @ 40), (N/A, 20)
        (5250 - 5330 @ 40), (N/A, 20), DFS
        (5490 - 5710 @ 40), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country RU:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5735 - 5835 @ 20), (N/A, 30)
+       (5170 - 5330 @ 40), (N/A, 20)
+       (5650 - 5710 @ 40), (N/A, 30)
+       (5735 - 5835 @ 40), (N/A, 30)
+
+country RW:
+       (2402 - 2482 @ 40), (N/A, 20)
+       (5735 - 5835 @ 40), (N/A, 30)
 
 country SA:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 20), (3, 23)
-       (5250 - 5330 @ 20), (3, 23), DFS
-       (5735 - 5835 @ 20), (3, 30)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country SE: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country SG:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 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
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country SK: 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
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country SV:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -622,14 +728,15 @@ country SY:
 country TW:
        (2402 - 2472 @ 40), (3, 27)
        (5270 - 5330 @ 40), (3, 17), DFS
-       (5735 - 5815 @ 40), (3, 30)
+       (5490 - 5710 @ 80), (3, 30), DFS
+       (5735 - 5815 @ 80), (3, 30)
 
 country TH:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country TT:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -645,19 +752,36 @@ country TN:
 
 country TR: DFS-ETSI
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 20), (N/A, 20)
-       (5250 - 5330 @ 20), (N/A, 20), DFS
-
+       (5170 - 5250 @ 80), (N/A, 20)
+       (5250 - 5330 @ 80), (N/A, 20), DFS
+       (5490 - 5710 @ 80), (N/A, 27), DFS
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
+ 
+# Source:
+# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
+# #1174 / 23 Oct 2008: http://www.nkrz.gov.ua/uk/activities/ruling/1225269361
+# (appendix 8)
+# 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:
-       (2402 - 2482 @ 40), (N/A, 20)
+       (2400 - 2483.5 @ 40), (N/A, 20), NO-OUTDOOR
+       (5150 - 5350 @ 40), (N/A, 20), NO-OUTDOOR
+       # 60 gHz band channels 1-4, ref: Etsi En 302 567
+       (57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
 
 country US: DFS-FCC
        (2402 - 2472 @ 40), (3, 27)
-       (5170 - 5250 @ 40), (3, 17)
-       (5250 - 5330 @ 40), (3, 20), DFS
-       (5490 - 5600 @ 40), (3, 20), DFS
-       (5650 - 5710 @ 40), (3, 20), DFS
-       (5735 - 5835 @ 40), (3, 30)
+       (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)
+       # 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)
 
 country UY:
        (2402 - 2482 @ 40), (N/A, 20)
@@ -679,18 +803,20 @@ country VE:
 
 country VN:
        (2402 - 2482 @ 40), (N/A, 20)
-       (5170 - 5250 @ 40), (N/A, 20)
-       (5250 - 5330 @ 40), (N/A, 20), DFS
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country YE:
        (2402 - 2482 @ 40), (N/A, 20)
 
 country ZA:
        (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)
+       (5170 - 5250 @ 80), (3, 17)
+       (5250 - 5330 @ 80), (3, 24), DFS
+       (5490 - 5710 @ 80), (3, 24), DFS
+       (5735 - 5835 @ 80), (3, 30)
 
 country ZW:
        (2402 - 2482 @ 40), (N/A, 20)