From: Ping-Ke Shih <pkshih@gmail.com>
To: wens@kernel.org
Cc: linux-wireless@vger.kernel.org,
wireless-regdb@lists.infradead.org, combuster@gmail.com
Subject: [PATCH] wireless-regdb: assert and correct maximum bandwidth within frequency difference
Date: Sat, 16 Nov 2024 16:24:17 +0800 [thread overview]
Message-ID: <20241116082417.8720-1-pkshih@gmail.com> (raw)
From: Ping-Ke Shih <pkshih@realtek.com>
Since kernel will reject max bandwidth being larger than freq_diff in
is_valid_reg_rule(), as well reject it ahead.
Closes: https://lore.kernel.org/linux-wireless/CAPGdDAmPp80VEZ0TG=cS3QAYKqELHfqChid0wYZ7eLAENFY86Q@mail.gmail.com/T/#u
Reported-by: Ivan Bulatovic <combuster@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
db.txt | 8 ++++----
dbparse.py | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/db.txt b/db.txt
index 32b533e800f5..a12f931ef4b2 100644
--- a/db.txt
+++ b/db.txt
@@ -787,11 +787,11 @@ country GT:
(2400 - 2483.5 @ 40), (500 mW)
(5150 - 5350 @ 80), (200 mW), NO-OUTDOOR
(5470 - 5725 @ 160), (250 mW), NO-OUTDOOR
- (5725 - 5850 @ 160), (500 mW), NO-OUTDOOR
+ (5725 - 5850 @ 80), (500 mW), NO-OUTDOOR
(5925 - 6425 @ 320), (200 mW), NO-OUTDOOR, AUTO-BW
- (6425 - 6525 @ 320), (200 mW), NO-OUTDOOR, AUTO-BW
+ (6425 - 6525 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
(6525 - 6875 @ 320), (150 mW), NO-OUTDOOR, AUTO-BW
- (6875 - 7125 @ 320), (150 mW), NO-OUTDOOR, AUTO-BW
+ (6875 - 7125 @ 160), (150 mW), NO-OUTDOOR, AUTO-BW
(57000 - 66000 @ 2160), (20 mW), NO-OUTDOOR
country GU: DFS-FCC
@@ -1646,7 +1646,7 @@ country RS: DFS-ETSI
(5250 - 5350 @ 80), (23), DFS, AUTO-BW
(5470 - 5725 @ 160), (27), DFS
(5725 - 5850 @ 80), (24), DFS, AUTO-BW
- (5850 - 5875 @ 80), (24), AUTO-BW
+ (5850 - 5875 @ 20), (24), AUTO-BW
(5925 - 6425 @ 320), (23), NO-OUTDOOR
# 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
diff --git a/dbparse.py b/dbparse.py
index 5f7e08200fa0..b27690166427 100755
--- a/dbparse.py
+++ b/dbparse.py
@@ -218,6 +218,9 @@ class DBParser(object):
self._syntax_error("Inverted freq range (%d - %d)" % (start, end))
if start == end:
self._syntax_error("Start and end freqs are equal (%d)" % start)
+ if bw > end - start:
+ self._syntax_error("BW is smaller than freq_diff (%d - %d) (%d)"
+ % (start, end, bw))
except ValueError:
self._syntax_error("band must have frequency range")
--
2.25.1
next reply other threads:[~2024-11-16 8:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-16 8:24 Ping-Ke Shih [this message]
2024-11-16 8:33 ` [PATCH] wireless-regdb: assert and correct maximum bandwidth within frequency difference Johannes Berg
2024-11-16 8:38 ` Johannes Berg
2024-11-16 8:58 ` Ping-Ke Shih
2024-11-16 13:32 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241116082417.8720-1-pkshih@gmail.com \
--to=pkshih@gmail.com \
--cc=combuster@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=wens@kernel.org \
--cc=wireless-regdb@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox