Merge branch 'openwrt:main' into wax206

Author: small-white-rabbit

package/base-files/files/bin/board_detect

@@ -1,14 +1,22 @@
 #!/bin/sh
 
-CFG=$1
+REAL_CFG=$1
 
-[ -n "$CFG" ] || CFG=/etc/board.json
+[ -n "$REAL_CFG" ] || REAL_CFG=/etc/board.json
 
-[ -d "/etc/board.d/" -a ! -s "$CFG" ] && {
+if [ -d "/etc/board.d/" ] && [ ! -s "$REAL_CFG" ]; then
+	# Use temp file to prevent incomplete file on power-cut, CFG is used by the sourced script to read/write the file
+	CFG="$(dirname "$REAL_CFG")/.$(basename "$REAL_CFG").tmp"
+	rm -f "$CFG" || exit
 	for a in $(ls /etc/board.d/*); do
-		[ -s $a ] || continue;
-		$(. $a)
+		[ -s "$a" ] || continue
+		(. "$a")
 	done
-}
+fi
 
-[ -s "$CFG" ] || return 1
+if [ -s "$CFG" ]; then
+	mv "$CFG" "$REAL_CFG" || exit
+else
+	rm -f "$CFG"
+	exit 1
+fi

package/boot/uboot-kirkwood/Makefile

@@ -25,6 +25,11 @@ define U-Boot/dns320l
   BUILD_DEVICES:=dlink_dns320l
 endef
 
+define U-Boot/dns325
+  NAME:=D-Link DNS-325 A1
+  BUILD_DEVICES:=dlink_dns-325-a1
+endef
+
 define U-Boot/dockstar
   NAME:=Seagate DockStar
   BUILD_DEVICES:=seagate_dockstar
@@ -112,6 +117,7 @@ endef
 
 UBOOT_TARGETS := \
 	dns320l \
+	dns325 \
 	dockstar dockstar_second_stage \
 	goflexhome \
 	ib62x0 ib62x0_second_stage \

package/boot/uboot-kirkwood/patches/011-arm-kirkwood-dns325-Correct-CONFIG_NR_DRAM_BANKS-parameter.patch

@@ -0,0 +1,27 @@
+From e7e650e8bdb09ac46da017250394f8c589df10bb Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@konsulko.com>
+Date: Mon, 14 Sep 2020 15:48:47 -0400
+Subject: [PATCH] arm: kirkwood: dns325: Correct CONFIG_NR_DRAM_BANKS parameter
+
+Testing on a DNS-325 NAS has shown that in order for the device to work
+we need to set CONFIG_NR_DRAM_BANKS to 1 and not 2.
+
+Tested-by: Dmitry N. Kolesnikov <dk.diklab@gmail.com>
+Reported-by: Dmitry N. Kolesnikov <dk.diklab@gmail.com>
+Cc: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
+Signed-off-by: Tom Rini <trini@konsulko.com>
+---
+ configs/dns325_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configs/dns325_defconfig
++++ b/configs/dns325_defconfig
+@@ -6,7 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
+ CONFIG_TARGET_DNS325=y
+ CONFIG_ENV_SIZE=0x20000
+ CONFIG_ENV_OFFSET=0xE0000
+-CONFIG_NR_DRAM_BANKS=2
++CONFIG_NR_DRAM_BANKS=1
+ CONFIG_IDENT_STRING="\nD-Link DNS-325"
+ # CONFIG_SYS_MALLOC_F is not set
+ CONFIG_BOOTDELAY=3

package/boot/uboot-kirkwood/patches/100-dns325.patch

@@ -0,0 +1,65 @@
+--- a/configs/dns325_defconfig
++++ b/configs/dns325_defconfig
+@@ -27,7 +27,7 @@ CONFIG_CMD_FAT=y
+ CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
+ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)"
++CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(u-boot),0x20000@0xe0000(u-boot-env),-@0x100000(ubi)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ISO_PARTITION=y
+ CONFIG_OF_CONTROL=y
+--- a/include/configs/dns325.h
++++ b/include/configs/dns325.h
+@@ -66,46 +66,12 @@
+  */
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"stdin=serial\0" \
+-	"stdout=serial\0" \
+-	"stderr=serial\0" \
+-	"loadaddr=0x800000\0" \
+-	"autoload=no\0" \
+-	"console=ttyS0,115200\0" \
+-	"mtdparts="CONFIG_MTDPARTS_DEFAULT \
+-	"optargs=\0" \
+-	"bootenv=uEnv.txt\0" \
+-	"importbootenv=echo Importing environment ...; " \
+-		"env import -t ${loadaddr} ${filesize}\0" \
+-	"loadbootenv=fatload usb 0 ${loadaddr} ${bootenv}\0" \
+-	"setbootargs=setenv bootargs console=${console} " \
+-		"${optargs} " \
+-		"${mtdparts} " \
+-		"root=${bootenvroot} " \
+-		"rootfstype=${bootenvrootfstype}\0" \
+-	"subbootcmd=run setbootargs; " \
+-		"if run bootenvloadimage; then " \
+-			"bootm ${loadaddr};" \
+-		"fi;\0" \
+-	"nandroot=ubi0:rootfs ubi.mtd=rootfs\0" \
+-	"nandrootfstype=ubifs\0" \
+-	"nandloadimage=nand read ${loadaddr} kernel\0" \
+-	"setnandbootenv=echo Booting from nand ...; " \
+-		"setenv bootenvroot ${nandroot}; " \
+-		"setenv bootenvrootfstype ${nandrootfstype}; " \
+-		"setenv bootenvloadimage ${nandloadimage}\0"
++	"mtdids="CONFIG_MTDIDS_DEFAULT "\0" \
++	"mtdparts="CONFIG_MTDPARTS_DEFAULT "\0"
+ 
+ #define CONFIG_BOOTCOMMAND \
+-	"if test -n ${bootenv} && usb start; then " \
+-		"if run loadbootenv; then " \
+-			"echo Loaded environment ${bootenv} from usb;" \
+-			"run importbootenv;" \
+-		"fi;" \
+-		"if test -n ${bootenvcmd}; then " \
+-			"echo Running bootenvcmd ...;" \
+-			"run bootenvcmd;" \
+-		"fi;" \
+-	"fi;" \
+-	"run setnandbootenv subbootcmd;"
++	"ubi part ubi; " \
++	"ubi read 0x800000 kernel; " \
++	"bootm 0x800000"
+ 
+ #endif /* _CONFIG_DNS325_H */

package/boot/uboot-kirkwood/patches/200-openwrt-config.patch

@@ -214,3 +214,23 @@
 +CONFIG_FIT_VERBOSE=y
  CONFIG_LZMA=y
 +CONFIG_LZO=y
+--- a/configs/dns325_defconfig
++++ b/configs/dns325_defconfig
+@@ -48,3 +48,8 @@ CONFIG_USB=y
+ CONFIG_DM_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
++CONFIG_LZMA=y
++CONFIG_LZO=y
+--- a/include/configs/dns325.h
++++ b/include/configs/dns325.h
+@@ -74,4 +74,6 @@
+ 	"ubi read 0x800000 kernel; " \
+ 	"bootm 0x800000"
+ 
++#include "openwrt-kirkwood-common.h"
++
+ #endif /* _CONFIG_DNS325_H */

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

@@ -16,6 +16,7 @@ checkpoint,l-50|\
 cloudengines,pogoe02|\
 cloudengines,pogoplugv4|\
 dlink,dns320l|\
+dlink,dns-325-a1\
 globalscale,sheevaplug|\
 iom,ix2-200|\
 iom,ix4-200d|\

package/kernel/mac80211/patches/ath11k/947-wifi-ath11k-fix-rssi-station-dump-for-IPQ5018-and-QC.patch

@@ -0,0 +1,32 @@
+From 8fd48529849310a68500d1d546f246d44697bbed Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Tue, 25 Nov 2025 14:56:08 +0100
+Subject: [PATCH] wifi: ath11k: fix rssi station dump for IPQ5018 and QCN6122
+
+Commit 031ffa6c2cd3 ("wifi: ath11k: fix rssi station dump not updated in
+QCN9074") didn't account for IPQ5018 and QCN6122 WiFi card that are
+based on QCN9074.
+
+Update the .mpdu_info_get_peerid to use the QCN9074 variant to correctly
+receive consistent RSSI station data.
+
+Reported-by: Scott Mercer <TheRootEd24@gmail.com>
+Suggested-by: Scott Mercer <TheRootEd24@gmail.com>
+Tested-by: Scott Mercer <TheRootEd24@gmail.com>
+Fixes: 031ffa6c2cd3 ("wifi: ath11k: fix rssi station dump not updated in QCN9074")
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+---
+ drivers/net/wireless/ath/ath11k/hw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/ath11k/hw.c
++++ b/drivers/net/wireless/ath/ath11k/hw.c
+@@ -1175,7 +1175,7 @@ const struct ath11k_hw_ops ipq5018_ops =
+ 	.rx_desc_get_attention = ath11k_hw_qcn9074_rx_desc_get_attention,
+ 	.reo_setup = ath11k_hw_ipq5018_reo_setup,
+ 	.rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload,
+-	.mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid,
++	.mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid,
+ 	.rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid,
+ 	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2,
+ 	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,

package/libs/libtraceevent/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtraceevent
-PKG_VERSION:=1.8.4
+PKG_VERSION:=1.8.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/
-PKG_HASH:=dc456d4d2bf4b4cd4d0c737d3374a8093f9e5ca18c1d7fc2279a4bf41e613121
+PKG_HASH:=812547d2f7b248485c183be2799b7041038ee44183000705609754b128c84c6f
 
 PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
 

package/libs/libunistring/patches/100-tests-pthread-rwlock-better-support-MUSL.patch

@@ -0,0 +1,36 @@
+From bdd92b59fe63553712fba57cc64cf8fe6e3e824a Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Tue, 25 Nov 2025 13:25:28 +0100
+Subject: [PATCH] tests: pthread-rwlock: better support MUSL
+
+MUSL doesn't provide PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP as
+it's only glibc and as the MACRO say, it's NP (not portable).
+
+Check for the presence of it and disable overwriting the function
+accordingly.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+---
+ tests/pthread-rwlock.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/tests/pthread-rwlock.c
++++ b/tests/pthread-rwlock.c
+@@ -49,7 +49,7 @@ pthread_rwlockattr_destroy (_GL_UNUSED p
+   return 0;
+ }
+ 
+-#elif PTHREAD_RWLOCK_BAD_WAITQUEUE
++#elif PTHREAD_RWLOCK_BAD_WAITQUEUE && defined PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
+ 
+ /* Override pthread_rwlockattr_init, to use the kind PREFER_WRITER_NONRECURSIVE
+    (or possibly PREFER_WRITER) instead of the kind DEFAULT.  */
+@@ -388,7 +388,7 @@ pthread_rwlock_destroy (pthread_rwlock_t
+ 
+ # else
+ 
+-#  if PTHREAD_RWLOCK_BAD_WAITQUEUE
++#  if PTHREAD_RWLOCK_BAD_WAITQUEUE && defined PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
+ 
+ /* Override pthread_rwlock_init, to use the kind PREFER_WRITER_NONRECURSIVE
+    (or possibly PREFER_WRITER) instead of the default, when no

package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc

@@ -288,7 +288,7 @@ function iface_vlan(interface, config, vlans) {
 		if (vlan.config.name && vlan.config.vid) {
 			let ifname = `${config.ifname}-${vlan.config.name}`;
 			file.write(`${vlan.config.vid} ${ifname}\n`);
-			netifd.set_vlan(interface, k, ifname);
+			netifd.set_vlan(interface, ifname, k);
 		}
 	file.close();
 
@@ -307,9 +307,6 @@ function iface_vlan(interface, config, vlans) {
 }
 
 function iface_wpa_stations(config, stas) {
-	if (!length(stas))
-		return;
-
 	let path = `/var/run/hostapd-${config.ifname}.psk`;
 
 	let file = fs.open(path, 'w');
@@ -326,9 +323,6 @@ function iface_wpa_stations(config, stas) {
 }
 
 function iface_sae_stations(config, stas) {
-	if (!length(stas))
-		return;
-
 	let path = `/var/run/hostapd-${config.ifname}.sae`;
 
 	let file = fs.open(path, 'w');