From 80b72c1cc63e98c6b118da4515cd6d11c0350d61 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 19 Oct 2022 20:14:00 +0800 Subject: [PATCH] wireless-regdb: unlock WIFI6E channel and txpower --- package/firmware/wireless-regdb/Makefile | 6 +-- .../patches/500-world-regd-5GHz.patch | 19 ++++++++- .../600-custom-fix-txpower-and-dfs.patch | 40 +++++++++---------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/package/firmware/wireless-regdb/Makefile b/package/firmware/wireless-regdb/Makefile index cbb97d86d..73ea40133 100644 --- a/package/firmware/wireless-regdb/Makefile +++ b/package/firmware/wireless-regdb/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wireless-regdb -PKG_VERSION:=2021.04.21 -PKG_RELEASE:=2 +PKG_VERSION:=2022.08.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/wireless-regdb/ -PKG_HASH:=9e4c02b2a9710df4dbdb327c39612e8cbbae6495987afeddaebab28c1ea3d8fa +PKG_HASH:=59c8f7d17966db71b27f90e735ee8f5b42ca3527694a8c5e6e9b56bd379c3b84 PKG_MAINTAINER:=Felix Fietkau diff --git a/package/firmware/wireless-regdb/patches/500-world-regd-5GHz.patch b/package/firmware/wireless-regdb/patches/500-world-regd-5GHz.patch index ae38f9353..8270ebc90 100644 --- a/package/firmware/wireless-regdb/patches/500-world-regd-5GHz.patch +++ b/package/firmware/wireless-regdb/patches/500-world-regd-5GHz.patch @@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau --- --- a/db.txt +++ b/db.txt -@@ -16,7 +16,7 @@ country 00: +@@ -19,13 +19,15 @@ country 00: # Channel 14. Only JP enables this and for 802.11b only (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM # Channel 36 - 48 @@ -14,3 +14,20 @@ Signed-off-by: Felix Fietkau # Channel 52 - 64 (5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW # Channel 100 - 144 + (5490 - 5730 @ 160), (20), NO-IR, DFS + # Channel 149 - 165 + (5735 - 5835 @ 80), (20), NO-IR ++ # Channel 1 - 223 ++ (5925 - 7125 @ 320), (12), AUTO-BW + # IEEE 802.11ad (60GHz), channels 1..3 + (57240 - 63720 @ 2160), (0) + +@@ -1736,7 +1736,7 @@ country US: DFS-FCC + (5850 - 5895 @ 40), (27), NO-OUTDOOR, AUTO-BW, NO-IR + # 6g band + # https://www.federalregister.gov/documents/2020/05/26/2020-11236/unlicensed-use-of-the-6ghz-band +- (5925 - 7125 @ 320), (12), NO-OUTDOOR, NO-IR ++ (5925 - 7125 @ 320), (12), AUTO-BW + # 60g band + # reference: section IV-D https://docs.fcc.gov/public/attachments/FCC-16-89A1.pdf + # channels 1-6 EIRP=40dBm(43dBm peak) diff --git a/package/firmware/wireless-regdb/patches/600-custom-fix-txpower-and-dfs.patch b/package/firmware/wireless-regdb/patches/600-custom-fix-txpower-and-dfs.patch index 959b69a00..46590f4d2 100644 --- a/package/firmware/wireless-regdb/patches/600-custom-fix-txpower-and-dfs.patch +++ b/package/firmware/wireless-regdb/patches/600-custom-fix-txpower-and-dfs.patch @@ -1,32 +1,30 @@ --- a/db.txt +++ b/db.txt -@@ -347,9 +347,9 @@ country CL: DFS-JP - (5735 - 5835 @ 80), (20) - +@@ -353,8 +353,8 @@ country CL: DFS-JP + # 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 country CN: DFS-FCC -- (2402 - 2482 @ 40), (20) -- (5170 - 5250 @ 80), (23), AUTO-BW -- (5250 - 5330 @ 80), (23), DFS, AUTO-BW -+ (2402 - 2482 @ 40), (30) -+ (5170 - 5250 @ 80), (30), AUTO-BW -+ (5250 - 5330 @ 80), (30), AUTO-BW - (5735 - 5835 @ 80), (30) +- (2400 - 2483.5 @ 40), (20) +- (5150 - 5350 @ 80), (20), DFS, AUTO-BW ++ (2400 - 2483.5 @ 40), (30) ++ (5150 - 5350 @ 160), (30) + (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 -@@ -1580,13 +1580,13 @@ country UG: DFS-FCC - country US: DFS-FCC - (2400 - 2483.5 @ 40), (30) +@@ -1626,14 +1626,12 @@ country US: DFS-FCC + (920-928 @ 8), (30) + (2400 - 2472 @ 40), (30) # 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 -+ (5150 - 5250 @ 80), (30), AUTO-BW -+ (5250 - 5350 @ 80), (30), AUTO-BW +- (5250 - 5350 @ 80), (24), DFS, AUTO-BW ++ (5150 - 5350 @ 160), (30) # 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), (23), DFS -+ (5470 - 5730 @ 160), (30) - (5730 - 5850 @ 80), (30) - # 60g band - # reference: section IV-D https://docs.fcc.gov/public/attachments/FCC-16-89A1.pdf +- (5470 - 5730 @ 160), (24), DFS +- (5730 - 5850 @ 80), (30), AUTO-BW ++ (5470 - 5850 @ 160), (30) + # https://www.federalregister.gov/documents/2021/05/03/2021-08802/use-of-the-5850-5925-ghz-band + # max. 33 dBm AP @ 20MHz, 36 dBm AP @ 40Mhz+, 6 dB less for clients + (5850 - 5895 @ 40), (27), NO-OUTDOOR, AUTO-BW, NO-IR