Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package wireless-regdb for openSUSE:Factory 
checked in at 2025-04-02 17:05:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireless-regdb (Old)
 and      /work/SRC/openSUSE:Factory/.wireless-regdb.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wireless-regdb"

Wed Apr  2 17:05:08 2025 rev:66 rq:1265473 version:20250220

Changes:
--------
--- /work/SRC/openSUSE:Factory/wireless-regdb/wireless-regdb.changes    
2024-01-04 15:57:07.623926164 +0100
+++ /work/SRC/openSUSE:Factory/.wireless-regdb.new.1907/wireless-regdb.changes  
2025-04-02 17:05:31.877654310 +0200
@@ -1,0 +2,12 @@
+Sat Mar 29 23:14:18 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Update to version 20250220 (boo#1240356):
+  * Update regulatory info for Oman (OM)
+  * Update regulatory rules for Iran (IR) on both 2.4 and 5Ghz for 2021
+  * Update regulatory info for Cayman Islands (KY) for 2024
+  * Update regulatory rules for Austria (AT)
+  * Permit 320 MHz bandwidth in 6 GHz band in ETSI/CEPT
+  * Update regulatory rules for Armenia (AM) on 2.4 and 5 GHz
+  * Update regulatory info for Azerbaijan (AZ) on 6GHz for 2024
+
+-------------------------------------------------------------------

Old:
----
  wireless-regdb-20231201.obscpio

New:
----
  wireless-regdb-20250220.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wireless-regdb.spec ++++++
--- /var/tmp/diff_new_pack.qnjapa/_old  2025-04-02 17:05:33.061703888 +0200
+++ /var/tmp/diff_new_pack.qnjapa/_new  2025-04-02 17:05:33.061703888 +0200
@@ -2,6 +2,7 @@
 # spec file for package wireless-regdb
 #
 # Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <andreas.stie...@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +20,7 @@
 %{?!_firmwaredir:%define _firmwaredir /lib/firmware}
 
 Name:           wireless-regdb
-Version:        20231201
+Version:        20250220
 Release:        0
 Summary:        802.11 regulatory domain database
 License:        ISC

++++++ _service ++++++
--- /var/tmp/diff_new_pack.qnjapa/_old  2025-04-02 17:05:33.097705395 +0200
+++ /var/tmp/diff_new_pack.qnjapa/_new  2025-04-02 17:05:33.097705395 +0200
@@ -1,10 +1,13 @@
 <services>
   <service mode="manual" name="obs_scm">
-    <param 
name="url">https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git</param>
+    <param 
name="url">git://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git</param>
     <param name="scm">git</param>
+    <param name="revision">master-2025-02-20</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">wireless-regdb</param>
-    <param name="versionformat">%cd</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">master-(.*)-(.*)-(.*)</param>
+    <param name="versionrewrite-replacement">\1\2\3</param>
   </service>
   <service mode="manual" name="set_version"/>
   <service name="tar" mode="buildtime"/>

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.qnjapa/_old  2025-04-02 17:05:33.117706233 +0200
+++ /var/tmp/diff_new_pack.qnjapa/_new  2025-04-02 17:05:33.121706400 +0200
@@ -1,8 +1,7 @@
 <servicedata>
-<service name="tar_scm">
-                <param 
name="url">git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git</param>
-              <param 
name="changesrevision">68a8f2f89cc58989bf4c1ade4757b2d5b680127e</param></service><service
 name="tar_scm">
-                <param 
name="url">https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git</param>
-              <param 
name="changesrevision">37dcea0e6e5effb4228fe385e906edba3cbee389</param></service></servicedata>
-(No newline at EOF)
+  <service name="tar_scm">
+     <param 
name="url">git://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git</param>
+     <param 
name="changesrevision">c2f11e2333f0d6dc66141d2c48c522815f6331d6</param>
+  </service>
+</servicedata>
 

++++++ wireless-regdb-20231201.obscpio -> wireless-regdb-20250220.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/wireless-regdb-20231201/.b4-config 
new/wireless-regdb-20250220/.b4-config
--- old/wireless-regdb-20231201/.b4-config      1970-01-01 01:00:00.000000000 
+0100
+++ new/wireless-regdb-20250220/.b4-config      2025-02-20 09:45:37.000000000 
+0100
@@ -0,0 +1,5 @@
+# Configuration for the `b4` tool
+# See https://b4.docs.kernel.org/en/latest/config.html
+[b4]
+    send-series-to = Chen-Yu Tsai <w...@kernel.org>
+    send-series-cc = linux-wirel...@vger.kernel.org, 
wireless-re...@lists.infradead.org
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/wireless-regdb-20231201/.gitignore 
new/wireless-regdb-20250220/.gitignore
--- old/wireless-regdb-20231201/.gitignore      2023-12-01 16:07:57.000000000 
+0100
+++ new/wireless-regdb-20250220/.gitignore      2025-02-20 09:45:37.000000000 
+0100
@@ -1,2 +1,9 @@
-key.priv.pem
-dbparse.pyc
+__pycache__/
+*.py[cod]
+*$py.class
+
+.custom
+!wens.key.pub.pem
+!wens.x509.pem
+*.pem
+*.patch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/wireless-regdb-20231201/Makefile 
new/wireless-regdb-20250220/Makefile
--- old/wireless-regdb-20231201/Makefile        2023-12-01 16:07:57.000000000 
+0100
+++ new/wireless-regdb-20250220/Makefile        2025-02-20 09:45:37.000000000 
+0100
@@ -69,6 +69,7 @@
                -signer $(REGDB_PUBCERT) \
                -inkey $(REGDB_PRIVKEY) \
                -in $< -nosmimecap -binary \
+               -noattr \
                -outform DER -out $@
 
 sha1sum.txt: db.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/wireless-regdb-20231201/db.txt 
new/wireless-regdb-20250220/db.txt
--- old/wireless-regdb-20231201/db.txt  2023-12-01 16:07:57.000000000 +0100
+++ new/wireless-regdb-20250220/db.txt  2025-02-20 09:45:37.000000000 +0100
@@ -44,12 +44,15 @@
        # 60 GHz band channels 1-4, ref: Etsi En 302 567
        (57000 - 66000 @ 2160), (40)
 
+# Source:
+# https://wam.ae/en/details/1395302898209
 country AE: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR
 
 country AF: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -78,10 +81,13 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
 
+# Source:
+# 2.4 GHz https://www.psrc.am/contents/document/4749
+# 5 GHz https://www.psrc.am/contents/document/11375
 country AM: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (18)
-       (5250 - 5330 @ 20), (18), DFS
+       (2400 - 2483.5 @ 40), (100 mW)
+       (5150 - 5350 @ 160), (17), NO-OUTDOOR, DFS
+       (5470 - 5875 @ 160), (17), NO-OUTDOOR, DFS
 
 country AN: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -89,12 +95,15 @@
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# https://www.boletinoficial.gob.ar/detalleAviso/primera/287126/20230524
 country AR: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 7125 @ 320), (12), NO-OUTDOOR
 
 country AS: DFS-FCC
        (2402 - 2472 @ 40), (30)
@@ -108,8 +117,8 @@
 #  EU decision 2005/513/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
 #  EU decision 2006/771/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
 #  EU decision 2021/1067/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/PDF/?uri=CELEX:32021D1067&from=EN
-# Harmonized CEPT countries (July 2019): 
https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf
-# AT: https://www.rtr.at/en/tk/Spektrum5GHz/1997_bmvit-info-052010en.pdf
+# Harmonized CEPT countries (February 2021): 
https://docdb.cept.org/download/25c41779-cd6e/Rec7003e.pdf
+# AT: 
https://www.rtr.at/TKP/was_wir_tun/telekommunikation/spectrum/bands/1997_bmvit-info-052010en.pdf
 # AT: acceptance 
https://www.ris.bka.gv.at/Dokumente/BgblAuth/BGBLA_2014_II_63/BGBLA_2014_II_63.pdfsig
 country AT: DFS-ETSI
        (2400 - 2483.5 @ 40), (100 mW)
@@ -119,9 +128,9 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
+       (57000 - 71000 @ 2160), (40)
 
 # Source:
 # 'Item' in the comments below refers to each numbered rule found at:
@@ -174,6 +183,7 @@
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (18), AUTO-BW
        (5250 - 5330 @ 80), (18), DFS, AUTO-BW
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
 
 # BA as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
@@ -218,7 +228,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -269,16 +279,21 @@
        # I.43 of the List, BDS EN 300 440-2, BDS EN 300 440-1
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        # II.H03 of the List, BDS EN 302 567-2
        (57000 - 66000 @ 2160), (40)
 
-country BH: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (20)
-       (5250 - 5330 @ 20), (20), DFS
-       (5735 - 5835 @ 20), (20)
+# Source:
+# 
https://tra-website-prod-01.s3-me-south-1.amazonaws.com/Media/Documents/Publications/20240227160125242_dudbapc5_5dk.pdf
+# (via https://www.tra.org.bh/en/category/apply-for-type-approval)
+country BH: DFS-ETSI
+       (2400 - 2483.5 @ 40), (100 mW)
+       (5150 - 5350 @ 80), (200 mW), DFS, NO-OUTDOOR
+       (5470 - 5725 @ 80), (27), DFS
+       (5725 - 5875 @ 80), (24), DFS
+       (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
+       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
 country BL: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -384,7 +399,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # https://www.ofcomnet.ch/api/rir/1010/11
-       (5945 - 6425 @ 160), (200 mW), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (200 mW), NO-OUTDOOR, wmmrule=ETSI
        # https://www.ofcomnet.ch/api/rir/1010/07
        (57000 - 71000 @ 2160), (40)
 
@@ -395,18 +410,24 @@
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
 
+# Source:
+# 
https://www.bcn.cl/leychile/navegar?idNorma=1109333&idParte=9841504&idVersion=&r_c=6
 country CL: DFS-JP
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (20), AUTO-BW
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5735 - 5835 @ 80), (20)
+       (5925 - 6425 @ 320), (12), NO-OUTDOOR
 
 # Source:
+# 
https://wap.miit.gov.cn/zwgk/zcwj/wjfb/tz/art/2021/art_e4ae71252eab42928daf0ea620976e4e.html
 # 
https://wap.miit.gov.cn/cms_files/filemanager/1226211233/attach/20219/d125301b13454551b698ff5afa49ca28.pdf
-# Note: The transmit power for 5150-5350MHz bands can be raised by 3dBm when 
TPC is implemented
+# 
https://www.miit.gov.cn/cms_files/filemanager/1226211233/attach/20236/d1dc19424d5a4cfe90d631adeee8dd58.pdf
+# Note: The transmit power for 5250-5350MHz bands can be raised by 3dBm when 
TPC is implemented
 country CN: DFS-FCC
        (2400 - 2483.5 @ 40), (20)
-       (5150 - 5350 @ 80), (20), DFS, AUTO-BW
+       (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
+       (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
        (5725 - 5850 @ 80), (33)
        # 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm
        # ref: 
http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
@@ -414,19 +435,26 @@
        (59400 - 63720 @ 2160), (44)
        (63720 - 65880 @ 2160), (28)
 
+# Source:
+# 
https://www.ane.gov.co/Sliders/archivos/gesti%C3%B3n%20t%C3%A9cnica/Estudios%20de%20gesti%C3%B3n%20y%20planeaci%C3%B3n/Banda%206%20GHz/Documentos%20decisi%C3%B3n/Resolucion%20000737%20del%2018112022.pdf
 country CO: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 7125 @ 320), (12), NO-OUTDOOR
 
+# Source:
+# 
https://storage.googleapis.com/eleoscompliance1.appspot.com/public/PNAF%20modificaci%C3%B3n%20ALCA87_30_04_2021.pdf
 country CR: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (17)
-       (5250 - 5330 @ 20), (24), DFS
-       (5490 - 5730 @ 20), (24), DFS
-       (5735 - 5835 @ 20), (30)
+       (2402 - 2482 @ 40), (36)
+       (5170 - 5250 @ 20), (30)
+       (5250 - 5330 @ 20), (30), DFS
+       (5490 - 5730 @ 20), (30), DFS
+       (5735 - 5835 @ 20), (36)
+       (5875 - 5925 @ 20), (30)
+       (5925 - 7125 @ 320), (30), NO-OUTDOOR
 
 # Source:
 # https://www.mincom.gob.cu/es/marco-legal
@@ -462,7 +490,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -482,7 +510,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -526,7 +554,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -547,7 +575,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -559,11 +587,14 @@
        (5250 - 5330 @ 80), (23), DFS, AUTO-BW
        (5735 - 5835 @ 80), (30)
 
+# Source:
+# https://indotel.gob.do/wp-content/uploads/2022/10/res_082_2022.pdf
 country DO: DFS-FCC
        (2402 - 2472 @ 40), (30)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (23), DFS, AUTO-BW
        (5735 - 5835 @ 80), (30)
+       (5925 - 7125 @ 320), (15), NO-OUTDOOR
 
 country DZ: DFS-JP
        (2402 - 2482 @ 40), (20)
@@ -596,7 +627,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -622,7 +653,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -646,7 +677,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -672,7 +703,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E low power indoor
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-6 (ETSI EN 302 567 v2.2.1)
        (57000 - 71000 @ 2160), (40)
 
@@ -750,15 +781,22 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
-country GT: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
+# Source:
+# 
https://sit.gob.gt/download/9685/tabla-nacional-de-atribucion-de-frecuencias/01WRXSS3QHSADNOSHDZ5HIWXE4TFFW3YIU/4.%20Tabla%20Nacional%20Atribuci%C3%B3n%20Frecuencias%20(Pies%20de%20P%C3%A1gina)
+country GT:
+       (2400 - 2483.5 @ 40), (500 mW)
+       (5150 - 5350 @ 80), (200 mW), NO-OUTDOOR
+       (5470 - 5725 @ 160), (250 mW), NO-OUTDOOR
+       (5725 - 5850 @ 80), (500 mW), NO-OUTDOOR
+       (5925 - 6425 @ 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 @ 160), (150 mW), NO-OUTDOOR, AUTO-BW
+       (57000 - 66000 @ 2160), (20 mW), NO-OUTDOOR
 
 country GU: DFS-FCC
        (2402 - 2472 @ 40), (30)
@@ -785,12 +823,16 @@
        (5730 - 5850 @ 80), (36)
        (5925 - 6425 @ 160), (14)
 
+# Source:
+# https://www.conatel.gob.hn/doc/Regulacion/resoluciones/2023/NR05-23.pdf
 country HN: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 6425 @ 320), (12), NO-OUTDOOR, NO-IR
+       (57240 - 71000 @ 2160), (40)
 
 country HR: DFS-ETSI
 # HR as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
@@ -808,7 +850,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -836,7 +878,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -862,7 +904,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -871,14 +913,16 @@
 # IL: https://www.gov.il/he/departments/legalInfo/telegraph_law
 # IL: official document (pdf): 
https://rfa.justice.gov.il/SearchPredefinedApi/Documents/IdngyMn~ojdQSrkxuAqfZqiM8c1foi3TSZQhp7OMszo=
 # IL: also available as unofficial word doc: 
https://www.nevo.co.il/Handlers/LawOpenDoc.ashx?id=199708
+# https://www.nevo.co.il/law_html/law01/502_483.htm#Seif9
 country IL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
+       (2400 - 2483.5 @ 40), (100 mW)
        (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW
+       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
        # Table B List of conditions, row 63, indoor short range device without 
TPC (ETSI EN 301 893)
        (5470 - 5725 @ 160), (500 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       # Table B List of conditions, row 68, wireless device using 
802.11a/n/ac protocol
-       (5725 - 5875 @ 80), (200 mW), AUTO-BW
+       # Table B List of conditions, row 68a
+       (5725 - 5875 @ 80), (25 mW), AUTO-BW
+       (5945 - 6425 @ 320), (200 mW), NO-OUTDOOR
 
 # Source:
 # 
https://dot.gov.in/spectrummanagement/delicensing-24-24835-ghz-band-gsr-45-e-5150-5350-ghz-gsr-46-e-and-5725-5875-ghz
@@ -890,9 +934,13 @@
        (5470 - 5725 @ 160), (24), DFS
        (5725 - 5875 @ 80), (30)
 
-country IR: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
+# Source:
+# 
https://asnad.cra.ir/fa/Public/Documents/Details/73af8590-f065-eb11-968f-0050569b0899
+country IR: DFS-ETSI
+       (2400 - 2483.5 @ 40), (100 mW)
+       (5150 - 5250 @ 80), (200 mW)
+       (5250 - 5350 @ 80), (200 mW), DFS, NO-OUTDOOR
+       (5470 - 5725 @ 160), (27), DFS, NO-INDOOR
 
 # IS as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
@@ -900,6 +948,7 @@
 #  EU decision 2006/771/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
 # Harmonized CEPT countries (July 2019): 
https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf
 # IS: https://www.pfs.is/library/Skrar/Tidnir-og-taekni/MHZ_21022019.pdf
+# CEPT ECC Decision (20)01 for 6GHz: https://docdb.cept.org/download/1448
 country IS: DFS-ETSI
        (2400 - 2483.5 @ 40), (100 mW)
        (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
@@ -907,6 +956,7 @@
        (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -924,7 +974,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -935,14 +985,22 @@
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
 
-country JO: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23)
-       (5735 - 5835 @ 80), (23)
+# Source:
+# 
https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf
+# ETSI EN 301 893: 
https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
+country JO: DFS-ETSI
+       (2400 - 2483.5 @ 40), (20)
+       (5150 - 5250 @ 80), (23), AUTO-BW
+       (5250 - 5350 @ 80), (23), DFS, AUTO-BW
+       (5470 - 5725 @ 80), (27), DFS, NO-OUTDOOR
+       (5725 - 5875 @ 80), (23), NO-OUTDOOR
+       (5925 - 6425 @ 320), (23), NO-OUTDOOR
+       (57000 - 71000 @ 2160), (40)
 
 # Source:
 # https://www.soumu.go.jp/main_content/000635492.pdf
 # https://www.soumu.go.jp/main_content/000833682.pdf
+# https://www.soumu.go.jp/main_content/000919158.pdf
 country JP: DFS-JP
        (2402 - 2482 @ 40), (20)
        (2474 - 2494 @ 20), (20), NO-OFDM
@@ -950,16 +1008,22 @@
        (5170 - 5250 @ 80), (20), AUTO-BW
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5730 @ 160), (23), DFS
-       (5925 - 6425 @ 160), (200 mW), NO-OUTDOOR
+       (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
        # 60 GHz band channels 2-4 at 10mW,
        # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf
        (57000 - 66000 @ 2160), (10 mW)
 
-country KE: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23)
-       (5490 - 5570 @ 80), (30), DFS
-       (5735 - 5775 @ 40), (23)
+# Source:
+# 
https://www.ca.go.ke/sites/default/files/2023-06/Guidelines-on-the-Use-of-Radiofrequency-Spectrum-by-Short-Range-Devices-2022.pdf
+# ETSI EN 301 893: 
https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
+# ETSI EN 302 502: 
https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf
+country KE: DFS-ETSI
+       (2400 - 2483.5 @ 40), (2000 mW)
+       (5150 - 5250 @ 80), (17), AUTO-BW
+       (5250 - 5350 @ 80), (17), DFS, AUTO-BW
+       (5470 - 5725 @ 80), (24), DFS
+       (5725 - 5875 @ 40), (24), DFS
+       (5925 - 6425 @ 320), (23), NO-OUTDOOR
 
 country KH: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -1000,17 +1064,24 @@
        # 60 GHz band channels 1-4
        (57000 - 66000 @ 2160), (43)
 
+# Source:
+# 
https://citra.gov.kw/sites/ar/Lists/CITRALaws/Attachments/14/%D8%A7%D9%84%D9%84%D8%A7%D8%A6%D8%AD%D8%A9%20%D8%A7%D9%84%D8%AA%D9%86%D8%B8%D9%8A%D9%85%D9%8A%D8%A9%20%D9%84%D8%AE%D8%AF%D9%85%D8%A9%20%D8%A7%D9%84%D9%88%D8%A7%D9%8A%20%D9%81%D8%A7%D9%8A.pdf
 country KW: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
+       (2400 - 2483.5 @ 40), (100 mW)
+       (5170 - 5250 @ 80), (200 mW), AUTO-BW
+       (5250 - 5350 @ 80), (17), DFS, AUTO-BW
+       (5470 - 5825 @ 160), (24), DFS
+       (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
 
+# Source: 
https://www.ofreg.ky/viewPDF/documents/2024-11-19-16-28-50-OfReg-WiFi-Permitted-Parameters-V2.pdf
 country KY: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
+       (2400 - 2483.5 @ 40), (1000 mW)
+       (5150 - 5250 @ 80), (250 mW), AUTO-BW
+       (5250 - 5350 @ 80), (250 mW), DFS, AUTO-BW
+       (5470 - 5730 @ 160), (250 mW), DFS
+       (5725 - 5875 @ 80), (1000 mW)
+       (5925 - 6425 @ 320), (12), NO-OUTDOOR
+       (57000 - 71000 @ 2160), (40)
 
 # Source:
 # http://adilet.zan.kz/rus/docs/V1500010730
@@ -1048,6 +1119,8 @@
 # LI: https://www.ofcomnet.ch/api/rir/1010/04
 # LI: https://www.ofcomnet.ch/api/rir/1008/12
 # LI: https://www.ofcomnet.ch/#/fatTable
+# CEPT ECC Decision (20)01 for 6GHz: https://docdb.cept.org/download/1448
+# LI: https://www.ofcomnet.ch/api/rir/1010/11
 country LI: DFS-ETSI
        (2400 - 2483.5 @ 40), (100 mW)
        (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
@@ -1055,6 +1128,7 @@
        (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1089,7 +1163,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1108,7 +1182,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1127,14 +1201,17 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
+# Source:
+# 
https://www.anrt.ma/sites/default/files/decision_a2fp_-vf-_mod_07.05.2021.pdf?csrt=14818568393101165775
 country MA: DFS-ETSI
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (20), AUTO-BW
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
+       (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
 
 # MC as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
@@ -1156,6 +1233,7 @@
 #  EU decision 2005/513/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
 #  EU decision 2006/771/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
 # Harmonized CEPT countries (July 2019): 
https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf
+# https://www.legis.md/cautare/downloadpdf/134846
 country MD: DFS-ETSI
        (2400 - 2483.5 @ 40), (100 mW)
        (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
@@ -1163,6 +1241,7 @@
        (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
 
 # Source:
 # 
http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Frequency%20Information%20System/National%20frequency%20tables/Montenegro%20NAFT%20-%202010.pdf
@@ -1207,19 +1286,26 @@
        # 60 GHz band channels 1-4, ref: Etsi En 302 567
        (57000 - 66000 @ 2160), (40)
 
+# Communications Regulatory Commission- CRC released Amendment to Resolution 
No. 37 of 2020
+# https://www.crc.gov.mn/storage/PDF/2022/2022-togtool1.pdf
 country MN: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (24), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 6425 @ 320), (100mW)
 
+# Source:
+# https://bo.io.gov.mo/bo/i/2024/16/despce.asp#64
 country MO: DFS-FCC
-       (2402 - 2482 @ 40), (23)
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (30), DFS
-       (5735 - 5835 @ 80), (30)
+       (2400 - 2483.5 @ 40), (200 mW)
+       (5150 - 5250 @ 80), (200 mW), AUTO-BW
+       (5250 - 5350 @ 80), (200 mW), DFS, AUTO-BW
+       (5470 - 5730 @ 160), (1000 mW), DFS
+       (5725 - 5850 @ 80), (1000 mW)
+       (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR
+       (57000 - 66000 @ 2160), (10000 mW)
 
 country MP: DFS-FCC
        (2402 - 2472 @ 40), (30)
@@ -1257,16 +1343,19 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
+# Source:
+# https://www.icta.mu/documents/2022/08/wifi6e_decision_0822.pdf
 country MU: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (24), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
 
 # Source:
 # http://www.cam.gov.mv/docs/tech_standards/TAM-TS-100-2004-WLAN.pdf
@@ -1282,19 +1371,37 @@
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# 
https://www.ift.org.mx/sites/default/files/comunicacion-y-medios/comunicados-ift/comunicado13ift_1.pdf
+# 
https://www.dof.gob.mx/nota_detalle.php?codigo=5681829&fecha=07/03/2023#gsc.tab=0
 country MX: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 6425 @ 320), (12), NO-OUTDOOR
 
+# Source:
+# 
https://www.mcmc.gov.my/skmmgovmy/media/General/CA-No-1-of-2022_-signed_19012022.pdf
 country MY: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5650 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (24)
+       (2402 - 2482 @ 40), (500 mW)
+       (5170 - 5250 @ 80), (1000 mW), AUTO-BW
+       (5250 - 5330 @ 80), (1000 mW), DFS, AUTO-BW
+       (5490 - 5650 @ 160), (1000 mW), DFS
+       (5735 - 5835 @ 80), (1000 mW)
+       (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
+
+# Source:
+# https://www.cran.na/yglilidy/2023/04/GG-8060-dated-3-April-2023.pdf
+country NA: DFS-ETSI
+       (2400 - 2483.5 @ 40), (100 mW)
+       (5150 - 5250 @ 80), (20), AUTO-BW, NO-OUTDOOR
+       (5250 - 5350 @ 80), (20), DFS, AUTO-BW, NO-OUTDOOR
+       (5470 - 5725 @ 160), (21), DFS
+       (5725 - 5875 @ 80), (24), DFS
+       (5925 - 6425 @ 320), (23), NO-OUTDOOR
+       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
 country NG: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -1327,7 +1434,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1347,7 +1454,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # WiFi 6E
-       (5945 - 6425 @ 160), (200 mW), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (200 mW), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 71000 @ 2160), (40)
 
@@ -1357,18 +1464,25 @@
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5735 - 5835 @ 80), (20)
 
+# Source:
+# https://gazette.govt.nz/notice/id/2022-go3100
 country NZ: DFS-ETSI
-       (2402 - 2482 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
+       (2400 - 2483.5 @ 40), (36)
+       (5150 - 5250 @ 80), (30), AUTO-BW
+       (5250 - 5350 @ 80), (27), DFS, AUTO-BW
+       (5470 - 5730 @ 160), (27), DFS
+       (5725 - 5875 @ 80), (36)
+       (5925 - 6425 @ 320), (24), NO-OUTDOOR
+       (57000 - 71000 @ 2160), (40)
 
 country OM: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
+       (2400 - 2483.5 @ 40), (100 mW), NO-OUTDOOR
+       (5170 - 5250 @ 80), (200 mW), AUTO-BW
+       (5250 - 5350 @ 80), (20), DFS, AUTO-BW
+       (5470 - 5725 @ 160), (27), DFS
+       (5725 - 5850 @ 80), (28), DFS, NO-INDOOR
+       (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR
+       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
 # Source:
 # http://www.asep.gob.pa/images/telecomunicaciones/Anexos/PNAF-dic2015.pdf
@@ -1380,12 +1494,15 @@
        (5725 - 5850 @ 80), (36)
        (57000 - 64000 @ 2160), (43)
 
+# Source:
+# 
https://cdn.www.gob.pe/uploads/document/file/1861732/Resoluci%C3%B3n%20Ministerial%20nro%20373-2021-MTC/01.pdf
 country PE: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 7125 @ 320), (12), NO-OUTDOOR
 
 country PF: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -1404,9 +1521,11 @@
 # NTC MC 03-05-2007 
https://ntc.gov.ph/wp-content/uploads/2015/10/LawsRulesRegulations/MemoCirculars/MC2007/MC-03-05-2007.pdf
 # NTC MC 03-08-2013 
https://region7.ntc.gov.ph/images/LawsRulesAndRegulations/MC/WDN/MC_03-08-2013.pdf
 # NTC MC 01-01-2016 
https://ntc.gov.ph/wp-content/uploads/2016/MC/Explanatory-MC-No-01-01-2016.pdf
+# NTC MC 002-07-2024 
https://ntc.gov.ph/wp-content/uploads/2024/MEMORANDUM%20CIRCULAR/NTC%20MC%20No.%20002-07-2024.pdf
 # 2400 - 2483.5 MHz: NTC MC 09-09-2003, Section 3.1; NTC MC 03-08-2013, 
Section 3.1; NTC MC 03-05-2007, Section 2
 # 5150 - 5350 MHz: NTC MC 09-09-2003, Section 3.1; NTC MC 03-08-2013, Section 
3.1; NTC MC 03-05-2007, Section 2
 # 5470 - 5850 MHz: NTC MC 09-09-2003, Section 3.1; NTC MC 03-08-2013, Section 
3.1 NTC MC 03-05-2007, Section 2
+# 5925 - 6425 MHz: NTC MC 002-07-2024, Section 1; NTC MC 03-05-2007, Section 2
 # 57000 - 66000 MHz: NTC MC 01-01-2016, Section 1
 
 country PH: DFS-FCC
@@ -1415,19 +1534,17 @@
        (5250 - 5350 @ 80), (23), DFS, AUTO-BW
        (5470 - 5725 @ 160), (24), DFS
        (5725 - 5850 @ 80), (24)
+       (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR
        (57000 - 66000 @ 2160), (24)
 
-country PK: DFS-JP
+country PK:
        # https://fab.gov.pk/type-approval/
        # https://pta.gov.pk/media/Pakistan_Table_of_Frequency_Allocations.pdf
        # 
https://www.pta.gov.pk/assets/media/iot_srd_regulatory_framework_01-06-2022.pdf
-       (2402 - 2482 @ 40), (100 mW)
-       (5150 - 5270 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
-       (5270 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
-       (5470 - 5610 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
-       (5610 - 5725 @ 80), (200 mW), AUTO-BW
-       (5725 - 5875 @ 80), (1000 mW)
-       (57000 - 66000 @ 2160), (40)
+       # 
https://www.pta.gov.pk/assets/media/2024-09-23-WLAN-Framework-Final-05-09-2024.pdf
+       (2400 - 2500 @ 40), (30)
+       (5725 - 5875 @ 80), (30)
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
 
 # PL as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
@@ -1443,7 +1560,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1475,7 +1592,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1493,12 +1610,15 @@
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
 
+# Source:
+# 
https://www.cra.gov.qa/-/media/System/D/2/5/8/D258CF18B83A5613B0D590193CB799CB/Class-License-WIFI-6E-Final-English-032022--V3.ashx
 country QA: DFS-ETSI
        (2400 - 2483.5 @ 40), (100 mW), NO-OUTDOOR
        (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
        (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW
        (5470 - 5725 @ 160), (100 mW), NO-OUTDOOR, DFS
        (5725 - 5875 @ 80), (100 mW), NO-OUTDOOR, DFS
+       (5925 - 6425 @ 320), (23), NO-OUTDOOR
        (57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
 country RE: DFS-ETSI
@@ -1522,7 +1642,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1533,13 +1653,15 @@
 #  EU decision 2005/513/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
 #  EU decision 2006/771/EC: 
https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
 # Harmonized CEPT countries (July 2019): 
https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf
+# 
https://www.ratel.rs/uploads/documents/empire_plugin/Uredba%20o%20utvrdjivanju%20Plana%20namene%20radiofrekvencijskih%20opsega.pdf
 country RS: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
-       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
-       (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
-       # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
+       (2400 - 2483.5 @ 40), (20)
+       (5150 - 5250 @ 80), (23), AUTO-BW
+       (5250 - 5350 @ 80), (23), DFS, AUTO-BW
+       (5470 - 5725 @ 160), (27), DFS
+       (5725 - 5850 @ 80), (24), DFS, 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)
 
@@ -1559,11 +1681,13 @@
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
 
+# Source: 
https://www.citc.gov.sa/en/RulesandSystems/RegulatoryDocuments/OtherRegulatoryDocuments/Documents/PL-PM-002-E-WiFi%20Regulations.pdf
 country SA: DFS-ETSI
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (20), AUTO-BW
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5710 @ 160), (27), DFS
+       (5925 - 7125 @ 320), (250 mW), NO-OUTDOOR
 
 # SE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
@@ -1580,29 +1704,35 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
-# 
https://www.imda.gov.sg/-/media/Imda/Files/Regulation-Licensing-and-Consultations/ICT-Standards/Telecommunication-Standards/Radio-Comms/IMDATSSRD.pdf
-# IMDA TS SRD, Issue 1 Revision 1, April 2019, subsequently "IMDA TS SRD"
-# 2400 - 2483.5 MHz: IMDA TS SRD, Table 1 (25); ANSI C63.10-2013 and FCC Part 
15 Section 15.247 or EN 300 328
-# 5150 - 5350 MHz: IMDA TS SRD, Table 1 (29); FCC Part 15 Section 15.407 (1) 
5.15-5.25 GHz (2) 5.25-5.35 GHz; EN 301 893
-# 5470 - 5725 MHz: IMDA TS SRD, Table 1 (30); FCC Part 15 Section 15.407 (2) 
5.47-5.725 GHz; EN 301 893
-# 5725 - 5850 MHz: IMDA TS SRD, Table 1 (27); FCC Part 15 Section 15.247; FCC 
Part 15 Section 15.407 (3) 5.725-5.85 GHz
-# 57000 - 66000 MHz: IMDA TS SRD, Table 1 (31); ETSI EN 302 567
-# Note: 27dBm for 5470-5725MHz bands is 3dBm reduction per FCC Part 15 Section 
15.407 (2) 5.47-5.725 GHz; EN 301 893 as referenced by IMDA TS SRD
+# 
https://www.imda.gov.sg/-/media/imda/files/regulation-licensing-and-consultations/ict-standards/telecommunication-standards/radio-comms/imdatssrd.pdf
+# IMDA TS SRD, Issue 1 Revision 3, Sep 2023, subsequently "IMDA TS SRD"
+# 2400 - 2483.5 MHz: IMDA TS SRD, Table 1 Sub-band 32e
+# 5150 - 5350 MHz: IMDA TS SRD, Table 1 Sub-band 33a
+# 5470 - 5725 MHz: IMDA TS SRD, Table 1 Sub-band 34
+# 5725 - 5850 MHz: IMDA TS SRD, Table 1 Sub-band 35
+# 5945 - 6425 MHz: IMDA TS SRD, Table 1 Sub-band 45b
+# 57000 - 66000 MHz: IMDA TS SRD, Table 1 Sub-band 40
+# Note: 500mW for 5470-5725MHz bands per FCC Part 15 Section 15.407 (2) 
5.47-5.725 GHz as referenced by IMDA TS SRD
 #  AU and BG regulatory domains use the same interpretation of cited FCC and 
ETSI standards
-# Note: The transmit power for 5250-5350MHz bands can be raised by 3dBm when 
TPC is implemented: IMDA TS SRD Table 1 (29)
-# Note: The transmit power for 5470-5725MHz bands can be raised by 3dBm when 
TPC is implemented: IMDA TS SRD Table 1 (30)
+# Note: The transmit power for 5250-5350MHz bands can be raised (by 3dBm) to 
200mW when TPC is implemented: IMDA TS SRD, Table 1 Sub-band 33a
+# Note: The transmit power for 5470-5725MHz bands can be raised (by 3dBm) to 
1000mW when TPC is implemented: IMDA TS SRD Table 1 Sub-band 34
 
 country SG: DFS-FCC
-       (2400 - 2483.5 @ 40), (23)
-       (5150 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5350 @ 80), (20), DFS, AUTO-BW
-       (5470 - 5725 @ 160), (27), DFS
-       (5725 - 5850 @ 80), (30)
-       (57000 - 66000 @ 2160), (40)
+       (2400 - 2483.5 @ 40), (200 mW)
+       (5150 - 5250 @ 80), (200 mW), AUTO-BW
+       (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW
+        # This range ends at 5725 MHz, but channel 144 extends to 5730 MHz.
+        # Since 5725 ~ 5730 MHz belongs to the next range which has looser
+        # requirements, we can extend the range by 5 MHz to make the kernel
+        # happy and be able to use channel 144.
+       (5470 - 5730 @ 160), (500 mW), DFS
+       (5725 - 5850 @ 80), (1000 mW)
+       (5945 - 6425 @ 320), (250 mW), NO-OUTDOOR
+       (57000 - 66000 @ 2160), (10000 mW)
 
 # SI as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
@@ -1619,7 +1749,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1640,7 +1770,7 @@
        # short range devices (ETSI EN 300 440-1)
        (5725 - 5875 @ 80), (25 mW)
        # 6 GHz band
-       (5945 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4 (ETSI EN 302 567)
        (57000 - 66000 @ 2160), (40)
 
@@ -1659,14 +1789,25 @@
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# 
https://www.siget.gob.sv/actualizacion-de-cuadro-nacional-de-atribucion-de-frecuencias-t-0408-2023/
 country SV: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 20), (17)
        (5250 - 5330 @ 20), (23), DFS
        (5735 - 5835 @ 20), (30)
+       (5925 - 7125 @ 320), (12), NO-OUTDOOR
 
-country SY:
-       (2402 - 2482 @ 40), (20)
+# Source:
+# 
https://sytpra.gov.sy/public/uploads/files/%D8%A7%D9%84%D8%A7%D8%B7%D8%A7%D8%B1%20%D8%A7%D9%84%D9%82%D8%A7%D9%86%D9%88%D9%86%D9%8A/%D9%84%D9%88%D8%A7%D8%A6%D8%AD%20%D8%AA%D9%86%D8%B8%D9%8A%D9%85%D9%8A%D8%A9/%D9%84%D9%88%D8%A7%D8%A6%D8%AD%20%D8%A7%D9%84%D8%B7%D9%8A%D9%81%20%D8%A7%D9%84%D8%AA%D8%B1%D8%AF%D8%AF%D9%8A%20%D8%A7%D9%84%D8%B1%D8%A7%D8%AF%D9%8A%D9%88%D9%8A/L1.pdf
+country SY: DFS-ETSI
+       (2400 - 2483.5 @ 40), (100 mW), NO-OUTDOOR
+       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
+       (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, DFS
+       (5470 - 5725 @ 160), (200 mW), NO-OUTDOOR, DFS
+       (5725 - 5850 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, DFS
+       (5850 - 5875 @ 20), (200 mW), NO-OUTDOOR, AUTO-BW
+       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
 # Source:
 # http://www.telecommission.tc/Spectrum-plan20110324-101210.html
@@ -1683,18 +1824,26 @@
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5710 @ 160), (27), DFS
 
+# Source:
+# 
https://arcep.tg/wp-content/uploads/2022/12/Decision-226-22-Determinant-les-categories-et-conditions-techniques-dexploitation-des-appareils-de-faible-puissance-et-de-faible-portee.pdf
 country TG: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 40), (20)
-       (5250 - 5330 @ 40), (20), DFS
-       (5490 - 5710 @ 40), (27), DFS
+       (2400 - 2483.5 @ 40), (100 mW), DFS
+       (5150 - 5350 @ 80), (20), DFS
+       (5470 - 5850 @ 160), (27), DFS
+       (5925 - 6425 @ 320), (23), DFS, NO-OUTDOOR
+       (57000 - 66000 @2160), (40), DFS
 
+# Source:
+# https://ratchakitcha.soc.go.th/documents/140D100S0000000004000.pdf
+# https://ratchakitcha.soc.go.th/documents/140D100S0000000004200.pdf
+# https://ratchakitcha.soc.go.th/documents/140D100S0000000004300.pdf
 country TH: DFS-FCC
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (17), AUTO-BW
        (5250 - 5330 @ 80), (24), DFS, AUTO-BW
        (5490 - 5730 @ 160), (24), DFS
        (5735 - 5835 @ 80), (30)
+       (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR
 
 country TN: DFS-ETSI
        (2402 - 2482 @ 40), (20)
@@ -1709,7 +1858,7 @@
        (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
        (5250 - 5330 @ 80), (20), DFS, NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
        (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI
-       (5495 - 6425 @ 160), (23), NO-OUTDOOR, wmmrule=ETSI
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR, wmmrule=ETSI
        # 60 GHz band channels 1-4, ref: Etsi En 302 567
        (57000 - 66000 @ 2160), (40)
 
@@ -1724,12 +1873,12 @@
 # Table of Frequency Allocations of Republic of China (Taiwan) / Feb 2017:
 #   https://www.motc.gov.tw/websitedowndoc?file=post/201702221012200.doc&; \
 #      filedisplay=Table%2Bof%2Bradio%2Bfrequency%2Ballocation.doc
-# LP0002 Low-power Radio-frequency Devices Technical Regulations / 23 Aug 2016:
-#   http://www.ncc.gov.tw/english/show_file.aspx?table_name=news&file_sn=681
+# LP0002 Low-power Radio-frequency Devices Technical Regulations / 6 Feb 2024:
+#   https://www.ncc.gov.tw/chinese/files/24020/538_49880_240206_3.pdf
 country TW: DFS-FCC
-       # 2.4g band, LP0002 section 3.10.1
+       # 2.4g band, LP0002 section 4.10.1
        (2400 - 2483.5 @ 40), (30)
-       # 5g U-NII band, LP0002 section 4.7
+       # 5g U-NII band, LP0002 section 5.7
        # 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients
        (5150 - 5250 @ 80), (23), AUTO-BW
        (5250 - 5350 @ 80), (23), DFS, AUTO-BW
@@ -1739,12 +1888,20 @@
        # happy and be able to use channel 144.
        (5470 - 5730 @ 160), (23), DFS
        (5725 - 5850 @ 80), (30)
-       # 60g band, LP0002 section 3.13.1.1 (3)(C), EIRP=40dBm(43dBm peak)
+       # 6g band, LP0002 section 5.13.1.1, EIRP=23dBm
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
+       # 60g band, LP0002 section 4.13.1.1 (1)(A), EIRP=40dBm(43dBm peak)
        (57000 - 66000 @ 2160), (40)
  
-country TZ:
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
+# Source:
+# 
https://www.tcra.go.tz/download/sw-1719952895-Minimum%20Technical%20Specifications%20for%20Short%20Range%20Devices%20(SRD),%20June%202024.pdf
+country TZ: DFS-ETSI
+       (2400 - 2483.5 @ 40), (100 mW)
+       (5150 - 5250 @ 80), (200 mW), AUTO-BW, NO-OUTDOOR
+       (5250 - 5350 @ 80), (20), DFS, AUTO-BW, NO-OUTDOOR
+       (5470 - 5725 @ 160), (250 mW), DFS
+       (5725 - 5850 @ 80), (24), DFS
+       (5945 - 6425 @ 320), (23), NO-OUTDOOR
 
 # Source: https://zakon.rada.gov.ua/laws/show/z0201-15#n48
 # Although it is allowed to use up to 250 mW for some 5 GHz frequency ranges,
@@ -1877,11 +2034,13 @@
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI
        (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
 
+# Source: 
https://www.gov.za/sites/default/files/gcis_document/202305/48643gon1822.pdf
 country ZA: DFS-ETSI
        (2402 - 2482 @ 40), (20)
        (5170 - 5250 @ 80), (20), AUTO-BW
        (5250 - 5330 @ 80), (20), DFS, AUTO-BW
        (5490 - 5710 @ 160), (30)
+       (5925 - 6425 @ 320), (14)
 
 country ZW: DFS-ETSI
        (2402 - 2482 @ 40), (20)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/wireless-regdb-20231201/dbparse.py 
new/wireless-regdb-20250220/dbparse.py
--- old/wireless-regdb-20231201/dbparse.py      2023-12-01 16:07:57.000000000 
+0100
+++ new/wireless-regdb-20250220/dbparse.py      2025-02-20 09:45:37.000000000 
+0100
@@ -121,6 +121,9 @@
     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 @@
             if not flag in flag_definitions:
                 raise FlagError(flag)
             self.flags |= flag_definitions[flag]
+        # ignore rule with NO-INDOOR as the kernel doesn't support it yet.
+        if 'NO-INDOOR' in flags:
+            raise IgnoreRule()
         self.textflags = flags
 
     def _as_tuple(self):
@@ -218,6 +224,9 @@
                 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")
 
@@ -426,6 +435,8 @@
             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' % (
Binary files old/wireless-regdb-20231201/regulatory.bin and 
new/wireless-regdb-20250220/regulatory.bin differ
Binary files old/wireless-regdb-20231201/regulatory.db and 
new/wireless-regdb-20250220/regulatory.db differ
Binary files old/wireless-regdb-20231201/regulatory.db.p7s and 
new/wireless-regdb-20250220/regulatory.db.p7s differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/wireless-regdb-20231201/sha1sum.txt 
new/wireless-regdb-20250220/sha1sum.txt
--- old/wireless-regdb-20231201/sha1sum.txt     2023-12-01 16:07:57.000000000 
+0100
+++ new/wireless-regdb-20250220/sha1sum.txt     2025-02-20 09:45:37.000000000 
+0100
@@ -1 +1 @@
-b72d3489a608197bda5e1d5e91db99ff649e9de3  db.txt
+d26398e03623b72d5abe111854b0bae35ec4bdc8  db.txt

++++++ wireless-regdb.obsinfo ++++++
--- /var/tmp/diff_new_pack.qnjapa/_old  2025-04-02 17:05:33.229710922 +0200
+++ /var/tmp/diff_new_pack.qnjapa/_new  2025-04-02 17:05:33.233711090 +0200
@@ -1,5 +1,5 @@
 name: wireless-regdb
-version: 20231201
-mtime: 1701443277
-commit: 37dcea0e6e5effb4228fe385e906edba3cbee389
+version: 20250220
+mtime: 1740041137
+commit: c2f11e2333f0d6dc66141d2c48c522815f6331d6
 

Reply via email to