[PATCH 1/2] Revert "wireless-regdb: Update regulatory info for Serbia (SR) for 2024"

[PATCH 1/2] Revert "wireless-regdb: Update regulatory info for Serbia (SR) for 2024"

[Ping-Ke Shih]

From: Ping-Ke Shih <pkshih@realtek.com>

The country alpha2 of Serbia is RS instead SR, so revert it.

This reverts commit 388c80ccba39d4ff4957a5d153c461aaac53e22e.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
sorry for the mistakes.
---
 db.txt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/db.txt b/db.txt
index adda839f4cf4..54310fb5736d 100644
--- a/db.txt
+++ b/db.txt
@@ -1765,14 +1765,11 @@ country SN: DFS-FCC
 	(5490 - 5730 @ 160), (24), DFS
 	(5735 - 5835 @ 80), (30)
 
-# Source:
-# https://www.ratel.rs/uploads/documents/empire_plugin/Uredba%20o%20utvrdjivanju%20Plana%20namene%20radiofrekvencijskih%20opsega.pdf
 country SR: DFS-ETSI
-	(2400 - 2483.5 @ 40), (20)
-	(5150 - 5250 @ 80), (23), AUTO-BW
-	(5250 - 5350 @ 80), (23), DFS, AUTO-BW
-	(5470 - 5725 @ 160), (27), DFS
-	(5925 - 6425 @ 320), (23), NO-OUTDOOR
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(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/
-- 
2.25.1

[PATCH 2/2] wireless-regdb: Update regulatory info for Serbia (RS) for 2024

[Ping-Ke Shih]

From: Ping-Ke Shih <pkshih@realtek.com>

Serbia government released radio frequency range on February 5, 2024 [1].
Based on Article 100, paragraph 5 of the Law on Electronic Communications
and Article 17, paragraph 1 and Article 42, paragraph 1 of the Law on
Government.

 * 2400 - 2483.5 MHz
   - reference [1] page 114-115, section 2400 MHz - 2450 MHz, 8th row
     * EN 300 328
       - 20 dBm
 * 5150 - 5350 MHz
   - reference [1] page 120-121, section 5150 MHz - 5250 MHz, 8th row
     reference [1] page 121,     section 5250 MHz - 5255 MHz, 8th row
     reference [1] page 121,     section 5255 MHz - 5350 MHz, 8th row
     * EN 301 893
       - 23 dBM (Without TPC)
       - 5250 - 5350 MHz, DFS
 * 5470 - 5725 MHz
   - reference [1] page 122,     section 5470 MHz - 5570 MHz, 8th row
     reference [1] page 122,     section 5570 MHz - 5650 MHz, 6th row
     reference [1] page 123,     section 5650 MHz - 5725 MHz, 8th row
     * EN 301 893
       - 27 dBm (Without TPC)
       - 5470 - 5725 MHz, DFS
 * 5725 - 5875 MHz
   - reference [1] page 123,     section 5725 MHz - 5830 MHz, 12th row
     * EN 302 502
       - 24 dBm
       - 5725 - 5850 MHz, DFS
 * 5925 - 6425 MHz
   - reference [1] page 124,     section 5925 MHz - 6700 MHz, 6th row
     * EN 303 687
       - 23 dBm, LPI
 * 57 - 66 GHz
   - reference [1] page 158,     section 57 GHz - 58.2 GHz, 7th row
     * EN 302 567
       - 40 dBm

[1] https://www.ratel.rs/uploads/documents/empire_plugin/Uredba%20o%20utvrdjivanju%20Plana%20namene%20radiofrekvencijskih%20opsega.pdf
[2] EN 302 328 https://www.etsi.org/deliver/etsi_en/300300_300399/300328/02.02.02_60/en_300328v020202p.pdf
[3] EN 302 066 https://www.etsi.org/deliver/etsi_en/302000_302099/302066/02.02.00_20/en_302066v020200a.pdf
[4] EN 301 893 https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf
[5] EN 302 502 https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf
[6] EN 303 687 https://www.etsi.org/deliver/etsi_en/303600_303699/303687/01.01.01_60/en_303687v010101p.pdf
[7] EN 302 567 https://www.etsi.org/deliver/etsi_en/302500_302599/302567/02.01.01_60/en_302567v020101p.pdf

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v1:
  - copy stuffs from reverted "SR".
  - add missing stuffs of "5725 - 5875 MHz" and "57 - 66 GHz"
---
 db.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/db.txt b/db.txt
index 54310fb5736d..93043733c3b0 100644
--- a/db.txt
+++ b/db.txt
@@ -1637,13 +1637,15 @@ country RO: DFS-ETSI
 #  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 @ 80), (24), AUTO-BW
+	(5925 - 6425 @ 320), (23), NO-OUTDOOR
 	# 60 GHz band channels 1-4, ref: Etsi En 302 567
 	(57000 - 66000 @ 2160), (40)
 
-- 
2.25.1

Re: [PATCH 1/2] Revert "wireless-regdb: Update regulatory info for Serbia (SR) for 2024"

[Chen-Yu Tsai]

On Tue, 01 Oct 2024 17:30:48 +0800, Ping-Ke Shih wrote:
> The country alpha2 of Serbia is RS instead SR, so revert it.
> 
> This reverts commit 388c80ccba39d4ff4957a5d153c461aaac53e22e.
> 
> 

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

[1/2] Revert "wireless-regdb: Update regulatory info for Serbia (SR) for 2024"
      https://git.kernel.org/wens/wireless-regdb/c/dbfae475bf85
[2/2] wireless-regdb: Update regulatory info for Serbia (RS) for 2024
      https://git.kernel.org/wens/wireless-regdb/c/b44edb2eaf3a

Best regards,
-- 
Chen-Yu Tsai <wens@kernel.org>