diff mbox series

[RESEND] wireless-regdb: Correct regulatory rules for China (CN)

Message ID 20240813-correct_cn-v1-1-91275dc00d9d@flygoat.com (mailing list archive)
State Accepted
Delegated to: Chen-Yu Tsai
Headers show
Series [RESEND] wireless-regdb: Correct regulatory rules for China (CN) | expand

Commit Message

Jiaxun Yang Aug. 13, 2024, 7:43 p.m. UTC 
As per "工业和信息化部关于加强和规范2400MHz、5100MHz和5800MHz频段无线电
管理有关事宜的通知" ("工信部无〔2021〕129号"), only 5250 MHz - 5350 MHz
band is required to have DFS / TPC.

This is slightly conflicting with is attachment "2400MHz、5100MHz 和
5800MHz 频段无线电发射设备射频技术要求", which stated that all devices
working at 5100 MHz band should implement DFS/TPC.

After consulting authorities, we determined that the requirement in
attachment should be interpreted as DFS/TPC is only required if the
device will work in DFS/TPC specified in the article.

Correct regulatory rules to opt-out DFS and revert TPC power deduction
for 5150 MHz - 5250 MHz.

Reported-by: leslie_sen <leslie_sen@163.com>
Fixes: e427ff2a592e ("wireless-regdb: Update regulatory rules for China (CN)")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 db.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


---
base-commit: 003c282a297f8cec06a576fe1434c94353d14610
change-id: 20240813-correct_cn-1d2e30b41e07

Best regards,

Comments

Chen-Yu Tsai Aug. 14, 2024, 4:12 a.m. UTC | #1 
On Tue, 13 Aug 2024 20:43:59 +0100, Jiaxun Yang wrote:
> As per "工业和信息化部关于加强和规范2400MHz、5100MHz和5800MHz频段无线电
> 管理有关事宜的通知" ("工信部无〔2021〕129号"), only 5250 MHz - 5350 MHz
> band is required to have DFS / TPC.
> 
> This is slightly conflicting with is attachment "2400MHz、5100MHz 和
> 5800MHz 频段无线电发射设备射频技术要求", which stated that all devices
> working at 5100 MHz band should implement DFS/TPC.
> 
> [...]

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

[1/1] wireless-regdb: Correct regulatory rules for China (CN)
      https://git.kernel.org/wens/wireless-regdb/c/3b347617c12a

Best regards,
diff mbox series

Patch

diff --git a/db.txt b/db.txt
index 788cd049ec21..9a55f6b8cc98 100644
--- a/db.txt
+++ b/db.txt
@@ -416,12 +416,14 @@  country CL: DFS-JP
 	(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
 # https://www.miit.gov.cn/cms_files/filemanager/1226211233/attach/20236/d1dc19424d5a4cfe90d631adeee8dd58.pdf
-# Note: The transmit power for 5150-5350MHz bands can be raised by 3dBm when TPC is implemented
+# 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, NO-OUTDOOR
+	(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