diff mbox series

[v4,1/3] wireless-regdb: allow NO-INDOOR flag in db.txt

Message ID 20250220003103.4484-1-pkshih@gmail.com (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series [v4,1/3] wireless-regdb: allow NO-INDOOR flag in db.txt | expand

Checks

Context Check Description
jmberg/tree_selection success Not a local patch

Commit Message

Ping-Ke Shih Feb. 20, 2025, 12:31 a.m. UTC 
From: Ping-Ke Shih <pkshih@realtek.com>

For certain regulations, frequency range is outdoor only, which flag should
be NO-INDOOR, but db2fw.py doesn't allow this flag.

As suggestion, only fill NO-INDOOR flag in db.txt, but ignore this rule
in parsing to binary.

Suggested-by: Johannes Berg <johannes@sipsolutions.net>
Link: https://lore.kernel.org/linux-wireless/5e433cd8d070682cb6ed31de3a2dd337e6f48b50.camel@sipsolutions.net/T/#t
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v4:
 - check NO-INDOOR after checking validity of all flags
v3:
 - new introduction by v3
---
 dbparse.py | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Chen-Yu Tsai Feb. 20, 2025, 8:37 a.m. UTC | #1 
On Thu, 20 Feb 2025 08:31:01 +0800, Ping-Ke Shih wrote:
> For certain regulations, frequency range is outdoor only, which flag should
> be NO-INDOOR, but db2fw.py doesn't allow this flag.
> 
> As suggestion, only fill NO-INDOOR flag in db.txt, but ignore this rule
> in parsing to binary.
> 
> 
> [...]

Applied to master in wens/wireless-regdb.git, thanks!

[1/3] wireless-regdb: allow NO-INDOOR flag in db.txt
      https://git.kernel.org/wens/wireless-regdb/c/9f7101175aec
[2/3] wireless-regdb: Update regulatory rules for Iran (IR) on both 2.4 and 5Ghz for 2021
      https://git.kernel.org/wens/wireless-regdb/c/719593ae617f
[3/3] wireless-regdb: Update frequency range with NO-INDOOR for Oman (OM)
      https://git.kernel.org/wens/wireless-regdb/c/974ae194f8b1

Best regards,
Chen-Yu Tsai Feb. 20, 2025, 8:49 a.m. UTC | #2 
On Thu, 20 Feb 2025 08:31:01 +0800, Ping-Ke Shih wrote:
> For certain regulations, frequency range is outdoor only, which flag should
> be NO-INDOOR, but db2fw.py doesn't allow this flag.
> 
> As suggestion, only fill NO-INDOOR flag in db.txt, but ignore this rule
> in parsing to binary.
> 
> 
> [...]

Sorry, I had to immediately do a force push as I mistakenly squashed in
database binary changes into one of the commits.

Here are the new commit hashes:

[1/3] wireless-regdb: allow NO-INDOOR flag in db.txt
      https://git.kernel.org/wens/wireless-regdb/c/3dd7ceb8aa75
[2/3] wireless-regdb: Update regulatory rules for Iran (IR) on both 2.4 and 5Ghz for 2021
      https://git.kernel.org/wens/wireless-regdb/c/4d754a1d5a3e
[3/3] wireless-regdb: Update frequency range with NO-INDOOR for Oman (OM)
      https://git.kernel.org/wens/wireless-regdb/c/8c8308a154df

Best regards,
diff mbox series

Patch

diff --git a/dbparse.py b/dbparse.py
index cc5012bc05bd..29f422445563 100755
--- a/dbparse.py
+++ b/dbparse.py
@@ -121,6 +121,9 @@  class FlagError(Exception):
     def __init__(self, flag):
         self.flag = flag
 
+class IgnoreRule(Exception):
+    pass
+
 @total_ordering
 class Permission(object):
     def __init__(self, freqband, power, flags, wmmrule):
@@ -135,6 +138,9 @@  class Permission(object):
             if not flag in flag_definitions:
                 raise FlagError(flag)
             self.flags |= flag_definitions[flag]
+        # ignore rule with NO-INDOOR so that kernel doesn't need special deal.
+        if 'NO-INDOOR' in flags:
+            raise IgnoreRule()
         self.textflags = flags
 
     def _as_tuple(self):
@@ -429,6 +435,8 @@  class DBParser(object):
             perm = Permission(b, p, flags, w)
         except FlagError as e:
             self._syntax_error("Invalid flag '%s'" % e.flag)
+        except IgnoreRule:
+            return
         for cname, c in self._current_countries.items():
             if perm in c:
                 self._warn('Rule "%s, %s" added to "%s" twice' % (