wireless-regdb: bump to latest release 2020-04-29

Update to latest release.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 493eef5b279a0455b76bfacabdec3af8bf642385)

diff --git a/package/firmware/wireless-regdb/Makefile b/package/firmware/wireless-regdb/Makefile
index 86343be04c469b8797b3f83488ea8f54edfba54e..fc18d159b1667bcce8346282f6fdf953489d5820 100644 (file)
--- a/package/firmware/wireless-regdb/Makefile
+++ b/package/firmware/wireless-regdb/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-regdb
-PKG_VERSION:=2019.06.03
+PKG_VERSION:=2020.04.29
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/network/wireless-regdb/
-PKG_HASH:=cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf
+PKG_HASH:=89fd031aed5977c219a71501e144375a10e7c90d1005d5d086ea7972886a2c7a
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 

diff --git a/package/firmware/wireless-regdb/patches/010-regdb-fix-compatibility-with-python2.patch b/package/firmware/wireless-regdb/patches/010-regdb-fix-compatibility-with-python2.patch
deleted file mode 100644 (file)
index 81f50f5..0000000
--- a/package/firmware/wireless-regdb/patches/010-regdb-fix-compatibility-with-python2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 651e39dee8605995b736b6056c6f7dc5c5a9c948 Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Thu, 22 Aug 2019 21:46:27 +0200
-Subject: [PATCH] regdb: fix compatibility with python2
-
-Various changes in the commit mentioned below broke
-compatibility with python2. Restore it in a way that
-makes it worth with both versions.
-
-Fixes: f3c4969c2485 ("wireless-regdb: make scripts compatible with Python 3")
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
----
- db2bin.py  | 2 +-
- db2fw.py   | 2 +-
- dbparse.py | 3 +--
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
---- a/db2bin.py
-+++ b/db2bin.py
-@@ -118,7 +118,7 @@ reg_country_ptr.set()
- for alpha2 in countrynames:
-     coll = countries[alpha2]
-     # struct regdb_file_reg_country
--    output.write(struct.pack('>BBxBI', alpha2[0], alpha2[1], coll.dfs_region, reg_rules_collections[coll.permissions]))
-+    output.write(struct.pack('>2sxBI', alpha2, coll.dfs_region, reg_rules_collections[coll.permissions]))
- 
- 
- if len(sys.argv) > 3:
---- a/db2fw.py
-+++ b/db2fw.py
-@@ -85,7 +85,7 @@ countrynames = list(countries)
- countrynames.sort()
- for alpha2 in countrynames:
-     coll = countries[alpha2]
--    output.write(struct.pack('>BB', alpha2[0], alpha2[1]))
-+    output.write(struct.pack('>2s', alpha2))
-     country_ptrs[alpha2] = PTR(output)
- output.write(b'\x00' * 4)
- 
---- a/dbparse.py
-+++ b/dbparse.py
-@@ -1,6 +1,5 @@
- #!/usr/bin/env python
- 
--from builtins import bytes
- from functools import total_ordering
- import sys, math
- from math import ceil, log
-@@ -359,7 +358,7 @@ class DBParser(object):
-         for cname in cnames:
-             if len(cname) != 2:
-                 self._warn("country '%s' not alpha2" % cname)
--            cname = bytes(cname, 'ascii')
-+            cname = cname.encode('ascii')
-             if not cname in self._countries:
-                 self._countries[cname] = Country(dfs_region, comments=self._comments)
-             self._current_countries[cname] = self._countries[cname]

diff --git a/package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch b/package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch
deleted file mode 100644 (file)
index 6febcc0..0000000
--- a/package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Willi <martin@strongswan.org>
-Date: Tue, 2 Jul 2019 16:19:44 +0200
-Subject: [PATCH] wireless-regdb: Fix overlapping ranges for Switzerland and
- Liechtenstein
-
-The commit referenced below changes the 5GHz frequency range 5250-5330
-to 5150-5330, making that range overlapping with the existing range
-5170-5250. This imposes DFS limitations and a reduced maximum power
-level for the range 5170-5250.
-
-The change of the frequency range seems not intentional. Instead the
-commit should have changed the 5170-5250 range to 5150-5250, and the
-5250-5330 range to 5250-5350 (see [1]).
-
-[1] https://www.ofcomnet.ch/api/rir/1010/05
-
-Fixes: 957a7cff72a3 ("wireless-regdb: update regulatory rules for Switzerland (CH), and Liechtenstein (LI) on 5GHz")
-Signed-off-by: Martin Willi <martin@strongswan.org>
-Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
-
-diff --git a/db.txt b/db.txt
-index d47ab94c3aa5..37393e6a793e 100644
---- a/db.txt
-+++ b/db.txt
-@@ -271,8 +271,8 @@ country CF: DFS-FCC
- # transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
- country CH: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5150 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-@@ -747,8 +747,8 @@ country LC: DFS-ETSI
- # transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
- country LI: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5150 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)

diff --git a/package/firmware/wireless-regdb/patches/601-wireless-regdb-Fix-ranges-of-EU-countries-as-they-ar.patch b/package/firmware/wireless-regdb/patches/601-wireless-regdb-Fix-ranges-of-EU-countries-as-they-ar.patch
deleted file mode 100644 (file)
index f9b97bc..0000000
--- a/package/firmware/wireless-regdb/patches/601-wireless-regdb-Fix-ranges-of-EU-countries-as-they-ar.patch
+++ /dev/null
@@ -1,843 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Emil Petersky <emil.petersky@streamunlimited.com>
-Date: Tue, 17 Sep 2019 09:49:19 +0200
-Subject: [PATCH] wireless-regdb: Fix ranges of EU countries as they are
- harmonized since 2014
-
-This patch unites entries for EU countries, as they have been harmonized
-latest by July 2014...
-
-EU decision 2005/513/EC:
-https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-EU decision 2006/771/EC:
-https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-
-Signed-off-by: Emil Petersky <emil.petersky@streamunlimited.com>
-Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
-
-diff --git a/db.txt b/db.txt
-index 2e149b6e0ea2..a57452479a9b 100644
---- a/db.txt
-+++ b/db.txt
-@@ -87,12 +87,20 @@ country AS: DFS-FCC
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
- 
-+# AT as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# AT: https://www.rtr.at/en/tk/Spektrum5GHz/1997_bmvit-info-052010en.pdf
-+# AT: acceptance https://www.ris.bka.gv.at/Dokumente/BgblAuth/BGBLA_2014_II_63/BGBLA_2014_II_63.pdfsig
- country AT: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- # Source:
-@@ -139,12 +147,22 @@ country BD: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
- 
-+# BE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# BE: https://www.ibpt.be/public/files/en/21760/B03-01_2.1_EN.pdf
-+# BE: https://www.ibpt.be/public/files/en/21761/B03-02_2.1_EN.pdf
-+# BE: https://www.ibpt.be/public/files/en/21762/B03-03_2.1_EN.pdf
-+# BE: https://www.ibpt.be/public/files/en/22165/B01-28_3.1_EN.pdf
- country BE: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country BF: DFS-FCC
-@@ -167,22 +185,29 @@ country BF: DFS-FCC
- #
- # Note: The transmit power limits in the 5250-5350 MHz and 5470-5725 MHz bands
- # can be raised by 3 dBm if TPC is enabled. Refer to BDS EN 301 893 for details.
-+#
-+# BG as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# BG: https://crc.bg/files/_en/Electronic_Communications_Revised_EN1.pdf
-+# BG: acceptance of 2006/771/EC https://crc.bg/files/Pravila_06_12_2018.pdf
- country BG: DFS-ETSI
-       # Wideband data transmission systems (WDTS) in the 2.4GHz ISM band, ref:
-       # I.22 of the List, BDS EN 300 328
--      (2402 - 2482 @ 40), (20)
-+      (2400 - 2483.5 @ 40), (100 mW)
-       # 5 GHz Radio Local Area Networks (RLANs), ref:
-       # II.H01 of the List, BDS EN 301 893
--      (5170 - 5250 @ 80), (23), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       # II.H01 of the List, I.54 from the List, BDS EN 301 893
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # Short range devices (SRDs) in the 5725-5875 MHz frequency range, ref:
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-       # I.43 of the List, BDS EN 300 440-2, BDS EN 300 440-1
--      (5725 - 5875 @ 80), (14)
--      # 60 GHz Multiple-Gigabit RLAN Systems, ref:
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       # II.H03 of the List, BDS EN 302 567-2
--      (57000 - 66000 @ 2160), (40), NO-OUTDOOR
-+      (57000 - 66000 @ 2160), (40)
- 
- country BH: DFS-JP
-       (2402 - 2482 @ 40), (20)
-@@ -265,16 +290,22 @@ country CF: DFS-FCC
-       (5490 - 5730 @ 40), (24), DFS
-       (5735 - 5835 @ 40), (30)
- 
--# Source:
--# https://www.ofcomnet.ch/#/fatTable
--# Note that the maximum transmitter power can be doubled for 5250-5710MHz if
--# transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
-+# CH as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# CH: https://www.ofcomnet.ch/api/rir/1010/05
-+# CH: https://www.ofcomnet.ch/api/rir/1010/04
-+# CH: https://www.ofcomnet.ch/api/rir/1008/12
-+# CH: https://www.ofcomnet.ch/#/fatTable
- country CH: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country CI: DFS-FCC
-@@ -329,26 +360,42 @@ country CX: DFS-FCC
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
- 
-+# CY as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# CY: http://www.mcw.gov.cy/mcw/dec/dec.nsf/all/292484CFC7013DD4C2256EBA0023D447/$file/Sxedio%20Radiosyxnothtwn%20ths%20Dhmokratias-3-8-2018-E2.2(English%20Unified%20Unofficial).pdf?openelement
- country CY: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
--# 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.
-+# CZ as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# CZ: https://www.ctu.cz/cs/download/vseobecna-opravneni/archiv/vo-r_12-06_2010-09.pdf
-+# CZ: https://www.ctu.cz/sites/default/files/obsah/ctu/vseobecne-opravneni-c.vo-r/10/12.2017-10/obrazky/vo-r10-122017-10.pdf
- country CZ: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
-+# DE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+#
- # Allocation for the 2.4 GHz band (Vfg 10 / 2013, Allgemeinzuteilung von
- # Frequenzen für die Nutzung in lokalen Netzwerken; Wireless Local Area
- # Networks (WLAN-Funkanwendungen).
-@@ -379,16 +426,22 @@ country DE: DFS-ETSI
-       # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
--# Sources:
-+# DK as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# DK: https://ens.dk/sites/ens.dk/files/Tele/frekvensplan_0.pdf
- # 5GHz: https://erhvervsstyrelsen.dk/sites/default/files/007_interface-datanet_5-6_ghz.pdf.pdf
- # 60GHz: https://erhvervsstyrelsen.dk/sites/default/files/radiograenseflader-63.pdf
- country DK: DFS-ETSI
--      (2400 - 2483.5 @ 40), (20)
--      (5150 - 5250 @ 80), (23), AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-       # 60 GHz band channels 1-4 (ETSI EN 302 567)
--      (57000 - 66000 @ 2160), (40), NO-OUTDOOR
-+      (57000 - 66000 @ 2160), (40)
- 
- # Source:
- # http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55
-@@ -417,12 +470,20 @@ country EC: DFS-FCC
-       (5490 - 5730 @ 20), (24), DFS
-       (5735 - 5835 @ 20), (30)
- 
-+# EE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# EE: https://www.ttja.ee/et/ettevottele-organisatsioonile/sideteenused/raadioseadmed/wifi-seade
-+# EE: https://www.itu.int/ITU-D/study_groups/SGP_1998-2002/JGRES09/pdf/estonia.pdf
- country EE: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country EG: DFS-ETSI
-@@ -430,17 +491,19 @@ country EG: DFS-ETSI
-       (5170 - 5250 @ 40), (20)
-       (5250 - 5330 @ 40), (20), DFS
- 
--# Source:
--# Cuadro nacional de atribución de frecuencias (CNAF)
--# https://avancedigital.gob.es/espectro/Paginas/cnaf.aspx
-+# ES as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# ES: https://avancedigital.gob.es/espectro/Paginas/cnaf.aspx
- country ES: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
--      # Short Range Devices (SRD) (ETSI EN 300 440)
-+      # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country ET: DFS-ETSI
-@@ -449,14 +512,18 @@ country ET: DFS-ETSI
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
- 
-+# FI as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
- country FI: DFS-ETSI
--      (2400 - 2483.5 @ 40), (20)
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-       # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country FM: DFS-FCC
-@@ -466,22 +533,34 @@ country FM: DFS-FCC
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
- 
-+# FR as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
- country FR: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
--        # short range devices (ETSI EN 300 440)
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
-+# GB as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# GB: https://www.ofcom.org.uk/__data/assets/pdf_file/0019/136009/Ofcom-Information-Sheet-5-GHz-RLANs.pdf
-+# GB: https://www.ofcom.org.uk/__data/assets/pdf_file/0028/84970/ir-2030.pdf
- country GB: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country GD: DFS-FCC
-@@ -523,12 +602,20 @@ country GP: DFS-ETSI
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
-       (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
- 
-+# GR as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# GR: https://www.eett.gr/opencms/export/sites/default/EETT_EN/Electronic_Communications/Radio_Communications/TelecommunicationEquipment/Radio_equipment_interface_requirement_2012.pdf
-+# GR: https://www.eett.gr/opencms/export/sites/default/EETT_EN/Electronic_Communications/Radio_Communications/TelecommunicationEquipment/Radio_equipment_interface_requirement_107.pdf
- country GR: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country GT: DFS-FCC
-@@ -563,11 +650,18 @@ country HN: DFS-FCC
-       (5735 - 5835 @ 80), (30)
- 
- country HR: DFS-ETSI
--      (2400 - 2483.5 @ 40), (20)
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+# HR as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# HR: http://tablice.hakom.hr:8080/vis?lang=en
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country HT: DFS-FCC
-@@ -577,37 +671,42 @@ country HT: DFS-FCC
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
- 
--# http://stir.nmhh.hu/?oldal=dokumentumGeneralo&root_rendeletelem_id=3&hatalyos=1
--# http://english.nmhh.hu/cikk/297/Eljarasi_tajekoztato_a_24_GHzes_es_az_5_GHzes_savban_mukodo_berendezesek_engedelyezeserol
--# http://nmhh.hu/dokumentum/319/kis_hatotavolsagu_eszkozok_srdk.pdf
-+# HU as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# HU: http://stir.nmhh.hu/?oldal=dokumentumGeneralo&root_rendeletelem_id=3&hatalyos=1
-+# HU: http://english.nmhh.hu/cikk/297/Eljarasi_tajekoztato_a_24_GHzes_es_az_5_GHzes_savban_mukodo_berendezesek_engedelyezeserol
-+# HU: http://nmhh.hu/dokumentum/319/kis_hatotavolsagu_eszkozok_srdk.pdf
- country HU: DFS-ETSI
--      # ref: 2006/771/EK, (EU) 2017/1483, MSZ EN 300 328
--      # additionally: 100mW @ 10MHz channels, 50mW @ 5MHz (max. 10mW/MHz)
--      (2400 - 2483.5 @ 40), (20)
--      # ref: 2005/513/EK
--      # note: TPC not needed @ 5150-5250
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      # note: max would be +3dB with TPC @ 5250-5725
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
--      # "Short Range Devices (SRD)"
--      # ref: 2006/771/EK, (EU) 2017/1483, MSZ EN 300 440, MSZ EN 302 064
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, "Fixed outdoor installation not allowed"
--      # ref: 2006/771/EK, (EU) 2017/1483, MSZ EN 302 567
--      (57000 - 66000 @ 2160), (40), NO-OUTDOOR
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-+      (57000 - 66000 @ 2160), (40)
- 
- country ID: DFS-JP
-       # ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
-       (2402 - 2482 @ 20), (20)
-       (5735 - 5815 @ 20), (23)
- 
-+# IE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# IE: https://www.comreg.ie/publication-download/interface-requirements-for-radio-services-in-ireland
-+# IE: https://www.comreg.ie/publication-download/permitted-short-range-devices-ireland
- country IE: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country IL: DFS-ETSI
-@@ -626,20 +725,33 @@ country IR: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
- 
-+# IS as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# IS: https://www.pfs.is/library/Skrar/Tidnir-og-taekni/MHZ_21022019.pdf
- country IS: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
-+# IT as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
- country IT: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country JM: DFS-FCC
-@@ -741,16 +853,22 @@ country LC: DFS-ETSI
-       (5490 - 5710 @ 160), (30), DFS
-       (5735 - 5815 @ 80), (30)
- 
--# Source:
--# https://www.ofcomnet.ch/#/fatTable
--# Note that the maximum transmitter power can be doubled for 5250-5710MHz if
--# transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
-+# LI as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# LI: https://www.ofcomnet.ch/api/rir/1010/05
-+# LI: https://www.ofcomnet.ch/api/rir/1010/04
-+# LI: https://www.ofcomnet.ch/api/rir/1008/12
-+# LI: https://www.ofcomnet.ch/#/fatTable
- country LI: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country LK: DFS-FCC
-@@ -768,28 +886,50 @@ country LS: DFS-ETSI
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
- 
-+# LT as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# LT: https://www.rrt.lt/en/radio-spectrum/frequency-management/ or direct link:
-+# LT: https://www.e-tar.lt/portal/lt/legalAct/6e718fd037a011e69101aaab2992cbcd/dGRioCBBHb
- country LT: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
-+# LU as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# LU: https://assets.ilr.lu/frequences/Documents/ILRLU-1723895916-183.pdf#search=en%20300%20440
- country LU: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
-+# LV as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# LV: http://likumi.lv/doc.php?id=198903
- country LV: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country MA: DFS-ETSI
-@@ -875,12 +1015,19 @@ country MR: DFS-ETSI
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
- 
-+# MT as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# MT: https://www.mca.org.mt/sites/default/files/NFP_edition%206-1.pdf
- country MT: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country MU: DFS-FCC
-@@ -930,34 +1077,36 @@ country NI: DFS-FCC
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
- 
--# Regulation on the use of frequency space without a license and
--# without notification 2015
--#
--# http://wetten.overheid.nl/BWBR0036378/2015-03-05
--
-+# NL as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# NL: http://wetten.overheid.nl/BWBR0036378/2015-03-05
- country NL: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-       # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
--# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
--# Power at 5250 - 5350 MHz, 5470 - 5725 MHz and 5815 – 5850 MHz can
--# be doubled if TPC is implemented.
--# Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band
--# which has been merged with 5470 - 5725 MHz to allow wide channels
-+# NO as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# NO: https://eng.nkom.no/technical/temporary-licenses/mobile-videolink/wireless-cameras-mobile-video-links/_attachment/9947
-+# NO: http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
-+# In addition to EU NO can use 5725–5795 MHz and 5815–5850 bands with limit of 4 W EIRP (with DFS and TPC)
- country NO: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
--      (5150 - 5250 @ 80), (200 mW), AUTO-BW, wmmrule=ETSI
--      (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5795 @ 160), (500 mW), DFS, wmmrule=ETSI
--      (5815 - 5850 @ 35), (2000 mW), DFS
--      (17100 - 17300 @ 200), (100 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country NP: DFS-JP
-@@ -1020,12 +1169,18 @@ country PK: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
- 
-+# PL as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
- country PL: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country PM: DFS-ETSI
-@@ -1041,14 +1196,19 @@ country PR: DFS-FCC
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
- 
-+# PT as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# PT: https://www.anacom.pt/render.jsp?categoryId=336334
- country PT: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-       # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- country PW: DFS-FCC
-@@ -1079,15 +1239,21 @@ country RE: DFS-ETSI
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
-       (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
- 
-+# RO as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# RO: http://www.ancom.org.ro/en/uploads/links_files/ordin_262_2006.pdf
- country RO: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
--
- # Source:
- # http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
- country RS: DFS-ETSI
-@@ -1119,18 +1285,20 @@ country SA: DFS-ETSI
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
- 
--# Source:
--# https://pts.se/globalassets/startpage/dokument/legala-dokument/foreskrifter/radio/beslutade_ptsfs-2018-3-undantagsforeskrifter.pdf
-+# SE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# SE: https://pts.se/globalassets/startpage/dokument/legala-dokument/foreskrifter/radio/beslutade_ptsfs-2018-3-undantagsforeskrifter.pdf
- country SE: DFS-ETSI
--      (2400 - 2483.5 @ 40), (20)
--      (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
--      # note: max would be +3dB with TPC @ 5250-5725
--      (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
--      (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
--      # short range devices (ETSI EN 300 440)
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
--      (57000 - 66000 @ 2160), (40), NO-OUTDOOR
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-+      (57000 - 66000 @ 2160), (40)
- 
- # Source
- # https://www.imda.gov.sg/~/media/imda/files/regulation%20licensing%20and%20consultations/ict%20standards/telecommunication%20standards/radio-comms/imdatssrd.pdf?la=en
-@@ -1144,20 +1312,36 @@ country SG: DFS-FCC
-       # (5470 - 5725 @ 160), (30), DFS
-       (5725 - 5850 @ 80), (30)
- 
-+# SI as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# SI: https://www.akos-rs.si/bwa
- country SI: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
-+# SK as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
-+# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
-+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
-+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
-+# SK: https://www.teleoff.gov.sk/data/files/25911.pdf
-+# SK: https://www.teleoff.gov.sk/data/files/41072.pdf
-+# SK: https://www.teleoff.gov.sk/data/files/49125_vpr-01_2018-rusi-vpr-10_2014a21_2012-nespecifik-srd_021018.pdf
- country SK: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
--      (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
--      # 60 GHz band channels 1-4, ref: Etsi En 302 567
-+      (2400 - 2483.5 @ 40), (100 mW)
-+      (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-+      (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-+      (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-+      # short range devices (ETSI EN 300 440-1)
-+      (5725 - 5875 @ 80), (25 mW)
-+      # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
- 
- # Source:

diff --git a/package/firmware/wireless-regdb/patches/602-wireless-regdb-Update-regulatory-rules-for-Russia-RU.patch b/package/firmware/wireless-regdb/patches/602-wireless-regdb-Update-regulatory-rules-for-Russia-RU.patch
deleted file mode 100644 (file)
index 7b883e6..0000000
--- a/package/firmware/wireless-regdb/patches/602-wireless-regdb-Update-regulatory-rules-for-Russia-RU.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dmitry Tunin <hanipouspilot@gmail.com>
-Date: Sat, 24 Aug 2019 11:48:10 +0300
-Subject: [PATCH] wireless-regdb: Update regulatory rules for Russia (RU)
-
-Russian entry is incorrect. According to the last regulations
-document of Feb 29, 2016, 160 MHz channels and 802.11ad are allowed.
-
-http://rfs-rf.ru/upload/medialibrary/c1a/prilozhenie-1-k-resheniyu-gkrch-_-16_36_03.pdf
-
-Note that there was never a DFS requirement in Russia, but always was
-NO-OUTDOOR on 5GHz.
-Maximum power is 200mW that is ~23dBm on all 5GHz channels.
-Also Russia has never been regulated by ETSI.
-
-EIRP has been reduced by 4dBm because of TPC requirement.
-
-Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
-Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
-
-diff --git a/db.txt b/db.txt
-index f6b2f921416c..9c4b447536e4 100644
---- a/db.txt
-+++ b/db.txt
-@@ -1349,14 +1349,12 @@ country RS: DFS-ETSI
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
- 
--country RU: DFS-ETSI
--      (2402 - 2482 @ 40), (20)
--      (5170 - 5250 @ 80), (20), AUTO-BW
--      (5250 - 5330 @ 80), (20), DFS, AUTO-BW
--      (5650 - 5730 @ 80), (30), DFS
--      (5735 - 5835 @ 80), (30)
-+country RU:
-+      (2400 - 2483.5 @ 40), (20)
-+      (5150 - 5350 @ 160), (20), NO-OUTDOOR
-+      (5650 - 5850 @ 160), (20), NO-OUTDOOR
-       # 60 GHz band channels 1-4, ref: Changes to NLA 124_Order №129_22042015.pdf
--      (57000 - 66000 @ 2160), (40)
-+      (57000 - 66000 @ 2160), (40), NO-OUTDOOR
- 
- country RW: DFS-FCC
-       (2402 - 2482 @ 40), (20)