600-wireless-regdb-Fix-overlapping-ranges-for-Switzerlan.patch 2.1 KB

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