Xr1710g 6.18 integration test sync 20260706 讨论openwrt上游分支一个文件冲突，代码修改方法

package/base-files/files/etc/banner

@@ -4,5 +4,7 @@
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
  -----------------------------------------------------
- %D %V, %C
+ YYH2913-jjcszxh-openwrt-xr1710g-6.18.38-integration-test-sync-20260707 0.0.8, 202607072019
+ -----------------------------------------------------
+ 本固件完全免费开源，遇到奸商售卖固件请退款，唯一可信下载渠道https://github.com/jjcszxh/openwrt-XR1710G
  -----------------------------------------------------

package/boot/uboot-tools/uboot-envtools/files/airoha_an7581

@@ -2,17 +2,33 @@
 # Copyright (C) 2025 OpenWrt.org
 #
 
-[ -e /etc/config/ubootenv ] && exit 0
+. /lib/functions.sh
+
+board=$(board_name)
+
+case "$board" in
+gemtek,w1700k-ubi|\
+econet,xr1710g-ubi|\
+nokia,xg-040g-md-ubi)
+	if [ -e /etc/config/ubootenv ] && [ -e /etc/fw_env.config ] &&
+		grep -Eq '^/dev/ubi[0-9]+_[0-9]+[[:space:]]' /etc/fw_env.config; then
+		exit 0
+	fi
+
+	rm -f /etc/config/ubootenv /etc/fw_env.config /etc/fw_sys.config
+	;;
+*)
+	[ -e /etc/config/ubootenv ] && exit 0
+	;;
+esac
 
 touch /etc/config/ubootenv
 
 . /lib/uboot-envtools.sh
-. /lib/functions.sh
-
-board=$(board_name)
 
 case "$board" in
 gemtek,w1700k-ubi|\
+econet,xr1710g-ubi|\
 nokia,xg-040g-md-ubi)
 	ubootenv_add_ubi_default
 	;;

package/boot/uboot-tools/uboot-envtools/files/fw_loadenv

@@ -11,6 +11,9 @@ if (fs.lsdir(path)) {
 	exit(0);
 }
 
+if (!fs.stat('/etc/fw_env.config'))
+	exit(0);
+
 let fp = fs.popen('fw_printenv');
 let raw = fp.read('all');
 fp.close();

package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh

@@ -66,8 +66,17 @@ ubootenv_add_mmc() {
 ubootenv_add_ubi_default() {
 	. /lib/upgrade/nand.sh
 	local envubi=$(nand_find_ubi ubi)
-	local envdev=/dev/$(nand_find_volume $envubi ubootenv)
-	local envdev2=/dev/$(nand_find_volume $envubi ubootenv2)
+	local envvol envvol2 envdev envdev2
+
+	[ -n "$envubi" ] || return 0
+
+	envvol="$(nand_find_volume $envubi ubootenv)"
+	envvol2="$(nand_find_volume $envubi ubootenv2)"
+	[ -n "$envvol" ] || return 0
+	[ -n "$envvol2" ] || return 0
+
+	envdev="/dev/$envvol"
+	envdev2="/dev/$envvol2"
 	ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x1f000" "1"
 	ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x1f000" "1"
 }

package/firmware/wireless-regdb/patches/600-custom-change-txpower-and-dfs.patch

@@ -0,0 +1,31 @@
+--- a/db.txt
++++ b/db.txt
+@@ -469,9 +469,8 @@ country CL: DFS-JP
+ # 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 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
+-	(5250 - 5350 @ 80), (20), NO-OUTDOOR, 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
+@@ -2081,14 +2080,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), (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), (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

package/firmware/wireless-regdb/patches/601-custom-6g-unlock.patch

@@ -0,0 +1,11 @@
+--- a/db.txt
++++ b/db.txt
+@@ -2091,7 +2091,7 @@
+ 	(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), (30)
+ 	# 60g band
+ 	# reference: section IV-D https://docs.fcc.gov/public/attachments/FCC-16-89A1.pdf
+ 	# channels 1-6 EIRP=40dBm(43dBm peak)

package/kernel/linux/modules/crypto.mk

@@ -522,8 +522,8 @@ endef
 $(eval $(call KernelPackage,crypto-hw-talitos))
 
 define KernelPackage/crypto-hw-eip93
-  TITLE:=MTK EIP93 crypto module
-  DEPENDS:=@(TARGET_ramips_mt7621||TARGET_airoha) \
+  TITLE:=SafeXcel EIP-93 Crypto Engine module
+  DEPENDS:=@(TARGET_airoha||TARGET_econet||TARGET_ramips_mt7621) \
 	+kmod-crypto-authenc \
 	+kmod-crypto-des \
 	+kmod-crypto-md5 \
@@ -540,10 +540,10 @@ define KernelPackage/crypto-hw-eip93
 endef
 
 define KernelPackage/crypto-hw-eip93/description
-Kernel module to enable EIP-93 Crypto engine as found
-in Mediatek MT7621 and Airoha SoCs.
-It enables DES/3DES/AES ECB/CBC/CTR and
-IPSEC offload with authenc(hmac(sha1/sha256), aes/cbc/rfc3686)
+Kernel module to enable EIP-93 Crypto engine as
+found in the Airoha / EcoNet / Mediatek MT7621 SoC.
+It enables DES/3DES/AES ECB/CBC/CTR and IPSEC offload
+with authenc(hmac(sha1/sha256), aes/cbc/rfc3686)
 endef
 
 $(eval $(call KernelPackage,crypto-hw-eip93))
@@ -1167,7 +1167,9 @@ $(eval $(call KernelPackage,crypto-sha512))
 
 define KernelPackage/crypto-test
   TITLE:=Test CryptoAPI module
-  KCONFIG:=CONFIG_CRYPTO_TEST
+  KCONFIG:= \
+	CONFIG_CRYPTO_TEST \
+	CONFIG_CRYPTO_BENCHMARK
   FILES:=$(LINUX_DIR)/crypto/tcrypt.ko
   $(call AddDepends/crypto,+kmod-crypto-manager)
 endef

package/kernel/linux/modules/netdevices.mk

@@ -657,6 +657,81 @@ endef
 $(eval $(call KernelPackage,phy-airoha-en8811h))
 
 
+define KernelPackage/airoha-npu
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Airoha Network Processor Unit support
+  DEPENDS:=@TARGET_airoha +airoha-en7581-mt7996-npu-firmware
+  KCONFIG:=CONFIG_NET_AIROHA_NPU
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/airoha/airoha_npu.ko
+  AUTOLOAD:=$(call AutoLoad,40,airoha_npu,1)
+endef
+
+define KernelPackage/airoha-npu/description
+  Kernel module for Airoha Network Processor Unit (NPU).
+  Required for PPE hardware flow offloading and WiFi WED offloading.
+endef
+
+$(eval $(call KernelPackage,airoha-npu))
+
+
+# SOE is linked into airoha-eth rather than shipped as a standalone module
+# because it shares the Ethernet driver's FE/QDMA rings and netdev lifetime.
+define KernelPackage/airoha-eth
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Airoha SoC Gigabit Ethernet support
+  DEPENDS:=@TARGET_airoha +kmod-airoha-npu +kmod-of-mdio \
+	+kmod-ipsec4-offload \
+	+IPV6:kmod-ipsec6-offload
+  KCONFIG:= \
+	CONFIG_NET_AIROHA \
+	CONFIG_NET_AIROHA_SOE
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/airoha/airoha-eth.ko
+  AUTOLOAD:=$(call AutoLoad,41,airoha-eth,1)
+endef
+
+define KernelPackage/airoha-eth/description
+  Kernel module for Airoha SoC Gigabit Ethernet.
+  Includes PPE and SOE support for hardware flow and ESP offloading.
+endef
+
+$(eval $(call KernelPackage,airoha-eth))
+
+
+define KernelPackage/dsa-mt7530
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=MediaTek MT7530/MT7531 DSA switch
+  DEPENDS:=@TARGET_airoha
+  KCONFIG:=CONFIG_NET_DSA_MT7530
+  FILES:=$(LINUX_DIR)/drivers/net/dsa/mt7530-dsa.ko
+  AUTOLOAD:=$(call AutoLoad,42,mt7530-dsa,1)
+endef
+
+define KernelPackage/dsa-mt7530/description
+  Kernel module for MediaTek MT7530/MT7531 Gigabit switch.
+  This is the core switch driver.
+endef
+
+$(eval $(call KernelPackage,dsa-mt7530))
+
+
+define KernelPackage/dsa-mt7530-mmio
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=MediaTek MT7530 MMIO interface driver
+  DEPENDS:=@TARGET_airoha +kmod-dsa-mt7530 +kmod-airoha-eth
+  KCONFIG:=CONFIG_NET_DSA_MT7530_MMIO
+  FILES:=$(LINUX_DIR)/drivers/net/dsa/mt7530-mmio.ko
+  AUTOLOAD:=$(call AutoLoad,43,mt7530-mmio,1)
+  DEFAULT:=y if TARGET_airoha_an7581
+endef
+
+define KernelPackage/dsa-mt7530-mmio/description
+  Kernel module for MediaTek MT7530 DSA switch with MMIO interface.
+  Used on Airoha EN7581 SoC with built-in switch.
+endef
+
+$(eval $(call KernelPackage,dsa-mt7530-mmio))
+
+
 define KernelPackage/phy-aquantia
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Aquantia Ethernet PHYs

package/kernel/linux/modules/netsupport.mk

@@ -246,8 +246,7 @@ define KernelPackage/ipsec4
 	CONFIG_INET_AH \
 	CONFIG_INET_ESP \
 	CONFIG_INET_IPCOMP \
-	CONFIG_INET_XFRM_TUNNEL \
-	CONFIG_INET_ESP_OFFLOAD=n
+	CONFIG_INET_XFRM_TUNNEL
   FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
 endef
@@ -264,6 +263,24 @@ endef
 $(eval $(call KernelPackage,ipsec4))
 
 
+define KernelPackage/ipsec4-offload
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPsec ESP offload support (IPv4)
+  DEPENDS:=+kmod-ipsec4
+  KCONFIG:= \
+	CONFIG_XFRM_OFFLOAD=y \
+	CONFIG_INET_ESP_OFFLOAD
+  FILES:=$(LINUX_DIR)/net/ipv4/esp4_offload.ko
+  AUTOLOAD:=$(call AutoLoad,33,esp4_offload)
+endef
+
+define KernelPackage/ipsec4-offload/description
+ Kernel module for IPv4 ESP transformation offload support.
+endef
+
+$(eval $(call KernelPackage,ipsec4-offload))
+
+
 IPSEC6-m = \
 	ipv6/ah6 \
 	ipv6/esp6 \
@@ -278,8 +295,7 @@ define KernelPackage/ipsec6
 	CONFIG_INET6_AH \
 	CONFIG_INET6_ESP \
 	CONFIG_INET6_IPCOMP \
-	CONFIG_INET6_XFRM_TUNNEL \
-	CONFIG_INET6_ESP_OFFLOAD=n
+	CONFIG_INET6_XFRM_TUNNEL
   FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
 endef
@@ -296,6 +312,24 @@ endef
 $(eval $(call KernelPackage,ipsec6))
 
 
+define KernelPackage/ipsec6-offload
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPsec ESP offload support (IPv6)
+  DEPENDS:=@IPV6 +kmod-ipsec6
+  KCONFIG:= \
+	CONFIG_XFRM_OFFLOAD=y \
+	CONFIG_INET6_ESP_OFFLOAD
+  FILES:=$(LINUX_DIR)/net/ipv6/esp6_offload.ko
+  AUTOLOAD:=$(call AutoLoad,33,esp6_offload)
+endef
+
+define KernelPackage/ipsec6-offload/description
+ Kernel module for IPv6 ESP transformation offload support.
+endef
+
+$(eval $(call KernelPackage,ipsec6-offload))
+
+
 define KernelPackage/iptunnel
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP tunnel support

package/kernel/mac80211/patches/subsys/372-wifi-cfg80211-fix-definition-of-EHT-MCS-15-in-MRU.patch

@@ -0,0 +1,33 @@
+From linux-wireless Fri Mar 13 06:21:49 2026
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Fri, 13 Mar 2026 06:21:49 +0000
+Subject: [PATCH] wifi: ieee80211: fix definition of EHT-MCS 15 in MRU
+
+According to IEEE Std 802.11be-2024 Table 9-417r, the bits indicate
+support for EHT-MCS 15 in:
+- B0: 52+26-tone and 106+26-tone MRUs
+- B1: a 484+242-tone MRU if 80 MHz is supported
+- B2: a 996+484-tone and a 996+484+242-tone MRU if 160 MHz is supported
+- B3: a 3x996-tone MRU if 320 MHz is supported
+
+Fixes: 6239da18d2f9 ("wifi: mac80211: adjust EHT capa when lowering bandwidth")
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ include/linux/ieee80211.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
+index f8e9f5d36d2a..a97b1d01f3ac 100644
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h
+@@ -3192,8 +3192,8 @@ struct ieee80211_eht_operation_info {
+ #define IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF		0x40
+ #define IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK	0x07
+
+-#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_80MHZ			0x08
+-#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_160MHZ		0x30
++#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_80MHZ			0x10
++#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_160MHZ		0x20
+ #define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_320MHZ		0x40
+ #define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK			0x78
+ #define IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP		0x80

package/kernel/mac80211/patches/subsys/373-wifi-mac80211-fix-missing-ieee80211_eml_params-member-init.patch

@@ -0,0 +1,26 @@
+From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
+Date: Tue, 10 Mar 2026 00:00:00 +0000
+Subject: [PATCH] wifi: mac80211: fix missing ieee80211_eml_params member initialization
+
+The missing initialization causes the driver to misinterpret the EML
+control bitmap, resulting in incorrect link bitmap handling.
+
+Fixes: 0d95280a2d54e ("wifi: mac80211: Add eMLSR/eMLMR action frame parsing support")
+Signed-off-by: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
+Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
+---
+ net/mac80211/eht.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/mac80211/eht.c b/net/mac80211/eht.c
+index 75096b2195d2..078e1e23d8d1 100644
+--- a/net/mac80211/eht.c
++++ b/net/mac80211/eht.c
+@@ -154,6 +154,7 @@ void ieee80211_rx_eml_op_mode_notif(struct ieee80211_sub_if_data *sdata,
+ 	u8 *ptr = mgmt->u.action.u.eml_omn.variable;
+ 	struct ieee80211_eml_params eml_params = {
+ 		.link_id = status->link_id,
++		.control = control,
+ 	};
+ 	struct sta_info *sta;
+ 	int opt_len = 0;