* [PATCH v2] wireless-regdb: assert and correct maximum bandwidth within frequency difference
@ 2024-11-18 1:15 Ping-Ke Shih
2024-12-09 4:35 ` Chen-Yu Tsai
0 siblings, 1 reply; 2+ messages in thread
From: Ping-Ke Shih @ 2024-11-18 1:15 UTC (permalink / raw)
To: wens; +Cc: linux-wireless, wireless-regdb, combuster
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>
---
v2:
- error message in dbparse.py should be "... _larger_ ..." instead.
- by the way, reporter tested v1 and got positive result
---
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..cc5012bc05bd 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 larger than freq_diff (%d - %d) (%d)"
+ % (start, end, bw))
except ValueError:
self._syntax_error("band must have frequency range")
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] wireless-regdb: assert and correct maximum bandwidth within frequency difference
2024-11-18 1:15 [PATCH v2] wireless-regdb: assert and correct maximum bandwidth within frequency difference Ping-Ke Shih
@ 2024-12-09 4:35 ` Chen-Yu Tsai
0 siblings, 0 replies; 2+ messages in thread
From: Chen-Yu Tsai @ 2024-12-09 4:35 UTC (permalink / raw)
To: Ping-Ke Shih; +Cc: linux-wireless, wireless-regdb, combuster
On Mon, 18 Nov 2024 09:15:03 +0800, Ping-Ke Shih wrote:
> Since kernel will reject max bandwidth being larger than freq_diff in
> is_valid_reg_rule(), as well reject it ahead.
>
>
Applied to master in wens/wireless-regdb.git, thanks!
[1/1] wireless-regdb: assert and correct maximum bandwidth within frequency difference
https://git.kernel.org/wens/wireless-regdb/c/b43aeb518a07
Best regards,
--
Chen-Yu Tsai <wens@kernel.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-09 4:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-18 1:15 [PATCH v2] wireless-regdb: assert and correct maximum bandwidth within frequency difference Ping-Ke Shih
2024-12-09 4:35 ` Chen-Yu Tsai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).