git.openwrt.org Git - openwrt/staging/hauke.git/blob

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Martin Willi <martin@strongswan.org>
   3 Date: Tue, 2 Jul 2019 16:19:44 +0200
   4 Subject: [PATCH] wireless-regdb: Fix overlapping ranges for Switzerland and
   5  Liechtenstein
   6
   7 The commit referenced below changes the 5GHz frequency range 5250-5330
   8 to 5150-5330, making that range overlapping with the existing range
   9 5170-5250. This imposes DFS limitations and a reduced maximum power
  10 level for the range 5170-5250.
  11
  12 The change of the frequency range seems not intentional. Instead the
  13 commit should have changed the 5170-5250 range to 5150-5250, and the
  14 5250-5330 range to 5250-5350 (see [1]).
  15
  16 [1] https://www.ofcomnet.ch/api/rir/1010/05
  17
  18 Fixes: 957a7cff72a3 ("wireless-regdb: update regulatory rules for Switzerland (CH), and Liechtenstein (LI) on 5GHz")
  19 Signed-off-by: Martin Willi <martin@strongswan.org>
  20 Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
  21
  22 diff --git a/db.txt b/db.txt
  23 index d47ab94c3aa5..37393e6a793e 100644
  24 --- a/db.txt
  25 +++ b/db.txt
  26 @@ -271,8 +271,8 @@ country CF: DFS-FCC
  27  # transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
  28  country CH: DFS-ETSI
  29         (2402 - 2482 @ 40), (20)
  30 -       (5170 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
  31 -       (5150 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
  32 +       (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
  33 +       (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
  34         (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
  35         # 60 GHz band channels 1-4, ref: Etsi En 302 567
  36         (57000 - 66000 @ 2160), (40)
  37 @@ -747,8 +747,8 @@ country LC: DFS-ETSI
  38  # transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
  39  country LI: DFS-ETSI
  40         (2402 - 2482 @ 40), (20)
  41 -       (5170 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
  42 -       (5150 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
  43 +       (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
  44 +       (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
  45         (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
  46         # 60 GHz band channels 1-4, ref: Etsi En 302 567
  47         (57000 - 66000 @ 2160), (40)