diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-04-25 14:56:20 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-01 11:12:31 +0200 |
| commit | 54b66833909fed59e1addcfd2064b13725b2e9ea (patch) | |
| tree | bd664aa8885e63eae2de5ac1de92a0421036e7e5 /package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch | |
| parent | 55591e63bcb21e9bd2327f9a2bc0fd55f14734d6 (diff) | |
| download | upstream-54b66833909fed59e1addcfd2064b13725b2e9ea.tar.gz upstream-54b66833909fed59e1addcfd2064b13725b2e9ea.tar.bz2 upstream-54b66833909fed59e1addcfd2064b13725b2e9ea.zip | |
wireless-regdb: backport three upstream fixes
Another release is overdue for quite some time, so I'm backporting three
fixes from upstream which I plan to backport into 19.07 as well.
Ref: FS#2880
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 76a0ddf1308782a4da2693978955aee9cf631862)
Diffstat (limited to 'package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch')
| -rw-r--r-- | package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch | 47 |
1 files changed, 47 insertions, 0 deletions
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 new file mode 100644 index 0000000000..6febcc060f --- /dev/null +++ b/package/firmware/wireless-regdb/patches/600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch @@ -0,0 +1,47 @@ +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) |