Merge pull request #1559 from kernelkit/releng

Final release touches

Config.in

@@ -110,9 +110,10 @@ config INFIX_OEM_PATH
 	  directory (absolute path) and the Infix post-build.sh will call `git
 	  describe -C $INFIX_OEM_PATH`.
 
-	  Note: for release builds the global variable INFIX_RELEASE overrides
-	  the version information derived from `git describe`.  However, the
-	  GIT version is always saved as the BUILD_ID in /etc/os-releases.
+	  Note: the OS version (VERSION, VERSION_ID, BUILD_ID in
+	  /etc/os-release) is always derived from `git describe`.  The global
+	  variable INFIX_RELEASE does not change it; it only labels the release
+	  channel (IMAGE_VERSION) and names the published artifacts.
 
 endmenu
 

configs/aarch64_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/aarch64_minimal_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/arm_defconfig

@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/arm_minimal_defconfig

@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_minimal_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

doc/ChangeLog.md

@@ -3,12 +3,28 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
-[v26.06.0][UNRELEASED]
+[v26.06.0][] - 2026-07-01
 -------------------------
 
+> [!NOTE]
+> Noteworthy changes and additions in this release:
+>
+> **🌐 Web Interface:** Infix gets its first-ever web interface!  Browse live
+> status and a full operational tree, handle common tasks from curated
+> configuration pages, and drop into a YANG tree editor for everything else.
+> A maintenance section covers firmware upgrade, backup & restore, and more.
+>
+> **📶 Wi-Fi Roaming & Mesh:** Access points sharing an SSID can hand clients
+> off seamlessly with 802.11k/v/r, form a cable-free 802.11s mesh backhaul,
+> and steer dual-band clients onto the faster 5/6 GHz band.
+>
+> **🗓️ System Scheduling:** Reusable time schedules based on ietf-schedule
+> (RFC 9922) let features like scheduled reboot and software update checks
+> run on a recurring, cron-style calendar.
+
 ### Changes
 
-- Upgrade Linux kernel to 6.18.36 (LTS)
+- Upgrade Linux kernel to 6.18.37 (LTS)
 - Upgrade Buildroot to 2025.02.15 (LTS)
 - Add basic web interface: static status pages and a tree view of operational
   status.  Curated configuration pages for some common tasks and a YANG tree
@@ -27,6 +43,13 @@ All notable changes to the project are documented in this file.
   iCalendar recurrence grouping pruned to cron-expressible rules.  Schedules
   are reusable time-specs; features (`scheduled-reboot`,
   `software/check-update`) trigger off them via a schedule reference
+- Configuring multiple BSS (more than one SSID) on a single Wi-Fi radio now
+  requires an explicitly configured MAC address per BSS
+- New operational `advertised-pmd-types` leaf-list on each Ethernet interface,
+  exposing the link modes currently advertised, to compare against the
+  `supported-pmd-types` introduced in v26.05.0
+- Release assets no longer ship separate `.sha256` checksum files; the
+  download page now publishes a SHA-256 checksum for each asset directly
 
 ### Fixes
 
@@ -39,6 +62,14 @@ All notable changes to the project are documented in this file.
   default `admin` user no permission to read or write the file from shell
 - Fix admin url shown for HTTP/HTTPS links in <https://network.local> browser,
   used pre-conflict resolution hostname.local, instead of hostname-2.local
+- Fix unreadable per-port temperature sensor names in `show hardware` on
+  Marvell based switches: each sensor is now named after the front-panel port
+  it serves (e.g. `e1`, `e2`) instead of a raw device-tree path.  `show
+  system` also reports a representative SoC temperature on CN913x platforms
+- Fix missing `contact` and `location` settings in operational status; the
+  values were configurable but never returned on RESTCONF/NETCONF reads
+- Fix spurious YANG validation warnings, for NTP and WireGuard configuration,
+  emitted on every NETCONF session and schema load
 
 [wifi]: https://www.kernelkit.org/infix/latest/wifi/
 
@@ -2174,7 +2205,7 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
  - N/A
 
 [buildroot]:  https://buildroot.org/
-[UNRELEASED]: https://github.com/kernelkit/infix/compare/v26.05.0...HEAD
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v26.06.0...HEAD
 [v26.06.0]:   https://github.com/kernelkit/infix/compare/v26.05.0...v26.06.0
 [v26.05.0]:   https://github.com/kernelkit/infix/compare/v26.04.0...v26.05.0
 [v26.04.0]:   https://github.com/kernelkit/infix/compare/v26.03.0...v26.04.0

infix.mk

@@ -4,10 +4,12 @@ oem-dir := $(call qstrip,$(INFIX_OEM_PATH))
 INFIX_TOPDIR = $(if $(oem-dir),$(oem-dir),$(BR2_EXTERNAL_INFIX_PATH))
 
 # Unless the user specifies an explicit build id, source it from git.
-# The build id also becomes the image version, unless an official
-# release is being built.
-export INFIX_BUILD_ID ?= $(shell git -C $(INFIX_TOPDIR) describe --dirty --always --tags)
-export INFIX_VERSION = $(if $(INFIX_RELEASE),$(INFIX_RELEASE),$(INFIX_BUILD_ID))
+# Exclude the moving 'latest*' tags so the version always resolves to a
+# real release tag, see issue #1524.  The build id is also the version
+# shown to users; INFIX_RELEASE only labels the release channel and names
+# artifacts (see INFIX_ARTIFACT below).
+export INFIX_BUILD_ID ?= $(shell git -C $(INFIX_TOPDIR) describe --dirty --always --tags --exclude 'latest*')
+export INFIX_VERSION = $(INFIX_BUILD_ID)
 export INFIX_ARTIFACT = $(call qstrip,$(INFIX_IMAGE_ID)$(if $(INFIX_RELEASE),-$(INFIX_RELEASE)))
 
 INFIX_CFLAGS:=-Wall -Werror -Wextra -Wno-unused-parameter -Wformat=2 -Wformat-overflow=2 -Winit-self -Wstrict-overflow=4 -Wno-format-truncation -Wno-format-nonliteral

patches/linux/6.18.37/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,4 +1,4 @@
-From a3165eb664d65da173e91e8b159b8daf9a1285c7 Mon Sep 17 00:00:00 2001
+From f614327b6eca20319f5eee20ac954ea8d92276e4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 01/50] net: phy: marvell10g: Support firmware loading on

patches/linux/6.18.37/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,4 +1,4 @@
-From 0ee3021b04ec64d96b90d9246f37d3d7a1f8f187 Mon Sep 17 00:00:00 2001
+From 7d453cb838611f44d7566b6174ae95a5d2265fa1 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 02/50] net: phy: marvell10g: Fix power-up when strapped to

patches/linux/6.18.37/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,4 +1,4 @@
-From 7e5a199bca36c5d8b1fd3875bbb8343c86db73ea Mon Sep 17 00:00:00 2001
+From 4b08a36e3107c4018ddf3a19760cc87d02281bd7 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 03/50] net: phy: marvell10g: Add LED support for 88X3310

patches/linux/6.18.37/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,4 +1,4 @@
-From 62a1468f5c6fdaba5074fa7555e3b7888762e4e7 Mon Sep 17 00:00:00 2001
+From e5e81eb1172db22be7c83efc8071108d0d42565e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 04/50] net: phy: marvell10g: Support LEDs tied to a single

patches/linux/6.18.37/0005-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,4 +1,4 @@
-From 38519daa6941dc275e3efaaba699b6441f1c19e2 Mon Sep 17 00:00:00 2001
+From 1f735096f1b8920ee6f21bf60a4c2d3f6376adeb Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 05/50] net: phy: Do not resume PHY when attaching

patches/linux/6.18.37/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,4 +1,4 @@
-From e11c3a1cf1979f558a1a1c06ed68a99b89273aea Mon Sep 17 00:00:00 2001
+From e38d2d2f07f55819d2191d4282dc2d4688075d7d Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 06/50] net: bridge: avoid classifying unknown multicast as

patches/linux/6.18.37/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,4 +1,4 @@
-From 9186aa368a4b580090d14ee1d9218ac33bc0aa5f Mon Sep 17 00:00:00 2001
+From a9b80b26c96e5492ab32a72ee36e3321a2b90ee9 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 07/50] net: bridge: Ignore router ports when forwarding L2

patches/linux/6.18.37/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,4 +1,4 @@
-From 9641f50de1c780b0e45be9095ab28cbbc4c70011 Mon Sep 17 00:00:00 2001
+From 01e41d87efa1b63d292f0acfe4d1fb0e39baab20 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 08/50] net: bridge: drop delay for applying strict multicast

patches/linux/6.18.37/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch

@@ -1,4 +1,4 @@
-From d14c3ad03563ac803180c18e6917eb506bea7079 Mon Sep 17 00:00:00 2001
+From 944c77d075c8e0655bd3a28e96892261465a5cf4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
 Subject: [PATCH 09/50] net: bridge: Differentiate MDB additions from

patches/linux/6.18.37/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch

@@ -1,4 +1,4 @@
-From 4d2335aac65d03c004d27cd27f077362588851e2 Mon Sep 17 00:00:00 2001
+From 3f58061ab8f869a6432a1256ee7422bb157b624e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
 Subject: [PATCH 10/50] nvmem: layouts: onie-tlv: Let device probe even when

patches/linux/6.18.37/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch

@@ -1,4 +1,4 @@
-From 1f727779b31e9dec09b669d07655371c45fbc64b Mon Sep 17 00:00:00 2001
+From f492d4efac3a65bca4d53e383336c36113e28a8b Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
 Subject: [PATCH 11/50] net: usb: r8152: add r8153b support for link/activity

patches/linux/6.18.37/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch

@@ -1,4 +1,4 @@
-From 8053206624b54fb84715342e7b921e0939d594a7 Mon Sep 17 00:00:00 2001
+From a2448b84e5483b5b91b46ac31b27609352fd9ed6 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 10 Aug 2025 18:52:54 +0200
 Subject: [PATCH 12/50] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to

patches/linux/6.18.37/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch

@@ -1,4 +1,4 @@
-From 5b4047d082c93431f77819b894e29a13acebd787 Mon Sep 17 00:00:00 2001
+From c4ac90dcc5aefbb704c70ebbfe041dee683b882b Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 20 Aug 2025 21:38:24 +0200
 Subject: [PATCH 13/50] drm/panel-simple: Add a timing for the Raspberry Pi 7"

patches/linux/6.18.37/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch

@@ -1,4 +1,4 @@
-From 3efdf41a3464704c4ffb99ea94266dc900f7b556 Mon Sep 17 00:00:00 2001
+From 8da101ec2429ba0bf1410346260f9a7ddfb0bdbe Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 21 Aug 2025 11:20:23 +0200
 Subject: [PATCH 14/50] input:touchscreen:edt-ft5x06: Add polled mode

patches/linux/6.18.37/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch

@@ -1,4 +1,4 @@
-From ce445d44a5e6ae84214986cbccef985a240e831d Mon Sep 17 00:00:00 2001
+From 93646f890903157bb78ef369ddf9d99a9161de0d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 15/50] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for

patches/linux/6.18.37/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

@@ -1,4 +1,4 @@
-From 57aa43c667a99e08c11a6141f80c068021585829 Mon Sep 17 00:00:00 2001
+From 29cfa1b5ffba41728dc5e0991d1ee27b903d569c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 16/50] net: dsa: mv88e6xxx: Improve indirect register access

patches/linux/6.18.37/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch

@@ -1,4 +1,4 @@
-From 70c247b71e2f2ede0cae581b0558bd09cd85275e Mon Sep 17 00:00:00 2001
+From a7fa9a45329781519702d46ba05815433fff4acc Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 17/50] net: dsa: mv88e6xxx: Honor ports being managed via

patches/linux/6.18.37/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch

@@ -1,4 +1,4 @@
-From b9b9cc025114c8bb8546012d575cbb9759ce6975 Mon Sep 17 00:00:00 2001
+From cda7100b0a29e6a9bd29a67ff9db3bcccb72065c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 18/50] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user

patches/linux/6.18.37/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch

@@ -1,4 +1,4 @@
-From 071b831a6ba7c5de2cc05738b595cea10e2eb068 Mon Sep 17 00:00:00 2001
+From ccf9f9262e8570cfd522b841465f3edf76b3447a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 19/50] net: dsa: tag_dsa: Use tag priority as initial

patches/linux/6.18.37/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch

@@ -1,4 +1,4 @@
-From 625493833fcdc4268a46ce4b2c59eefb1a0a0be0 Mon Sep 17 00:00:00 2001
+From 3200169701ef4d9afdea35355b3fe41d6f363134 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 20/50] net: dsa: Support MDB memberships whose L2 addresses

patches/linux/6.18.37/0021-net-dsa-Support-EtherType-based-priority-overrides.patch

@@ -1,4 +1,4 @@
-From c59543ced113c4a66ccf07cbfac5dc7dd6cb253e Mon Sep 17 00:00:00 2001
+From dea9ff6c0bdf7c3e4abc2fb507d2ab4b94dabb63 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 21/50] net: dsa: Support EtherType based priority overrides

patches/linux/6.18.37/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch

@@ -1,4 +1,4 @@
-From fb04b75bc53f6b1b27f91f4ed21013b293e8577c Mon Sep 17 00:00:00 2001
+From 1dc01d7420e3d511babfbdeda742d93527d72abb Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 22/50] net: dsa: mv88e6xxx: Support EtherType based priority

patches/linux/6.18.37/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch

@@ -1,4 +1,4 @@
-From 32e460b9fbc7b25817c05b9ec2c01f4827f7cca7 Mon Sep 17 00:00:00 2001
+From caed0d150badbb040e403975645bf09ba3f44e76 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 23/50] net: dsa: mv88e6xxx: Add mqprio qdisc support

patches/linux/6.18.37/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch

@@ -1,4 +1,4 @@
-From 30f92e6d97e8d6d8fe36e872e627b28fcf24fdac Mon Sep 17 00:00:00 2001
+From 1bd5b0e8a5574209b386d6d8bc1cf3bcf2e4fd5e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 24/50] net: dsa: mv88e6xxx: Use VLAN prio over IP when both

patches/linux/6.18.37/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch

@@ -1,4 +1,4 @@
-From a9055d21d1237a5449d5f410d3a0c3d8953a1965 Mon Sep 17 00:00:00 2001
+From 7894882d70e8223939a6d9a0e15cc6bbc08ae33c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
 Subject: [PATCH 25/50] [FIX] net: dsa: mv88e6xxx: Trap locally terminated

patches/linux/6.18.37/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch

@@ -1,4 +1,4 @@
-From 7fb7bc76b39078049d7965bef1bc976f9e1142c5 Mon Sep 17 00:00:00 2001
+From 09cb11eaf5cc754274620ff6eaedf768c9605e44 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
 Subject: [PATCH 26/50] net: dsa: mv88e6xxx: collapse disabled state into

patches/linux/6.18.37/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch

@@ -1,4 +1,4 @@
-From 2a8ff34ccf08f85f985ebea74b6eb47a64e2f247 Mon Sep 17 00:00:00 2001
+From 7127fd4194cde754cbc9ea869c9e65e335701d95 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
 Subject: [PATCH 27/50] net: dsa: mv88e6xxx: Only activate LAG offloading when

patches/linux/6.18.37/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch

@@ -1,4 +1,4 @@
-From 348c281450bf30875877045d628f8a56ef7896a1 Mon Sep 17 00:00:00 2001
+From c2f3d9277e12e7622651b521af8b43b1fe036cf0 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 14 Jan 2026 18:22:41 +0100
 Subject: [PATCH 28/50] net: dsa: mv88e6xxx: Add LED support for 6393X

patches/linux/6.18.37/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch

@@ -1,4 +1,4 @@
-From 653db5307cd9d69d6b14e163f02226c83e26bd05 Mon Sep 17 00:00:00 2001
+From ac98be8b6fd1b6afa264c68685d5dc82d73da1f8 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 15 Jan 2026 22:47:37 +0100
 Subject: [PATCH 29/50] wifi: brcmfmac: support deletion and recreation of

patches/linux/6.18.37/0030-wifi-brcmfmac-check-connection-state-before-querying.patch

@@ -1,4 +1,4 @@
-From 6445e629e19b9380dc96c9e5bfd15bbf706e1311 Mon Sep 17 00:00:00 2001
+From 9f1110fe13c878c49d28859f27bd90bc1b77f7bc Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Mon, 19 Jan 2026 13:06:53 +0100
 Subject: [PATCH 30/50] wifi: brcmfmac: check connection state before querying

patches/linux/6.18.37/0031-wifi-brcmfmac-suppress-log-spam-for-regulatory-restr.patch

@@ -1,4 +1,4 @@
-From 2b970f903b571a3f3ca6e6043b2608c30825463f Mon Sep 17 00:00:00 2001
+From 188203d0d4eeeb607b29efa344280189c2566f30 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:12:10 +0100
 Subject: [PATCH 31/50] wifi: brcmfmac: suppress log spam for

patches/linux/6.18.37/0032-wifi-brcmfmac-reduce-log-noise-during-AP-to-station-.patch

@@ -1,4 +1,4 @@
-From eab236832c10d0a0c05fcab145abfe4267857957 Mon Sep 17 00:00:00 2001
+From c02051fdfbcedf99bac490bcb0358774774e2bcf Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:18:45 +0100
 Subject: [PATCH 32/50] wifi: brcmfmac: reduce log noise during AP to station

patches/linux/6.18.37/0033-net-phy-air_en8811h-add-OF-device-table-for-auto-loa.patch

@@ -1,4 +1,4 @@
-From 8bad16ffcea19fde114ac772399140ded40c6b91 Mon Sep 17 00:00:00 2001
+From 613dec2af90a208b2bb453150cb1851de07d51fb Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 17 Feb 2026 21:59:59 +0100
 Subject: [PATCH 33/50] net: phy: air_en8811h: add OF device table for

patches/linux/6.18.37/0034-drm-vc4-dsi-enable-video-and-then-retry-failed-trans.patch

@@ -1,4 +1,4 @@
-From 105d92fb189196e292f1ec60bc6f4abf883e1d3d Mon Sep 17 00:00:00 2001
+From 5df424aa25bcfd2f0309fbd05670f0b613219456 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 20 Sep 2024 12:05:18 +0100
 Subject: [PATCH 34/50] drm: vc4: dsi: enable video and then retry failed

patches/linux/6.18.37/0035-drm-vc4-dsi-Clocks-should-be-running-before-reset.patch

@@ -1,4 +1,4 @@
-From 85515b63fa683de8025f439c0ba290b535cada59 Mon Sep 17 00:00:00 2001
+From 88e744997f5c6ff9c9383fbe568c925c11715896 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Jun 2022 17:23:47 +0100
 Subject: [PATCH 35/50] drm: vc4: dsi: Clocks should be running before reset

patches/linux/6.18.37/0036-drm-vc4-Ensure-DSI-is-enabled-for-FIFO-resets.patch

@@ -1,4 +1,4 @@
-From 0bbed592738a780abea49cd71806daa40d9ce602 Mon Sep 17 00:00:00 2001
+From 9cd8a5347a9aa06f60512c4ca4fe1c7591c7e1d9 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 5 Apr 2024 17:51:55 +0100
 Subject: [PATCH 36/50] drm/vc4: Ensure DSI is enabled for FIFO resets

patches/linux/6.18.37/0037-drm-vc4-Reset-DSI-AFE-on-disable.patch

@@ -1,4 +1,4 @@
-From db28d17b76e911d9e592b07b38dcaa2990efd942 Mon Sep 17 00:00:00 2001
+From 7c91806a1637d2fc3c83b44cbd758741527b93bb Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 26 May 2022 18:56:19 +0100
 Subject: [PATCH 37/50] drm: vc4: Reset DSI AFE on disable

patches/linux/6.18.37/0038-drm-vc4-dsi-Handle-the-different-command-FIFO-widths.patch

@@ -1,4 +1,4 @@
-From a3da11f394aaa52ee4a3be1ea63b2439066b126a Mon Sep 17 00:00:00 2001
+From 772bd1971a7c1fb2554cadfb111e8aabb974dd1a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 20 Nov 2024 13:58:08 +0000
 Subject: [PATCH 38/50] drm: vc4: dsi: Handle the different command FIFO widths

patches/linux/6.18.37/0039-drm-bridge-tc358762-Program-the-DPI-mode-into-the-ch.patch

@@ -1,4 +1,4 @@
-From 4f9b6e7917fb525ce1c8a1247602e67e0a90be39 Mon Sep 17 00:00:00 2001
+From 419f4339059576e35a8e4ebebd3677a8e3f6143f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 9 Jan 2024 17:37:00 +0000
 Subject: [PATCH 39/50] drm/bridge: tc358762: Program the DPI mode into the

patches/linux/6.18.37/0040-drm-bridge-tc358762-revert-move-ops-to-enable.patch

@@ -1,4 +1,4 @@
-From 24575bd2a0efeeae983c605786095fb2d49978cf Mon Sep 17 00:00:00 2001
+From 66d0d523c84e59a08a1aa1849aa0363bfa3a7641 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 9 Jan 2024 18:44:49 +0000
 Subject: [PATCH 40/50] drm/bridge: tc358762: revert move ops to enable

patches/linux/6.18.37/0041-drm-bridge-tc358762-Set-pre_enabled-on-pre_enable-to.patch

@@ -1,4 +1,4 @@
-From bac7eb3cfe56c161944b77f9729f5f3fe5fd0d70 Mon Sep 17 00:00:00 2001
+From e55233b40d6ed7e6643bb439780c96613c0b1a0c Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Sat, 4 Apr 2026 18:04:19 +0200
 Subject: [PATCH 41/50] drm/bridge: tc358762: Set pre_enabled on pre_enable to

patches/linux/6.18.37/0042-net-pcs-add-standalone-PCS-registration-infrastructu.patch

@@ -1,4 +1,4 @@
-From 6dcd3256ab1fcf224fc7bb41fb47b37f9f7cda16 Mon Sep 17 00:00:00 2001
+From 6683a6a60276d5c39451eb7049247e043937bc2f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 5 Apr 2026 11:33:00 +0200
 Subject: [PATCH 42/50] net/pcs: add standalone PCS registration infrastructure

patches/linux/6.18.37/0043-net-pcs-add-MediaTek-MT7988-USXGMII-PCS-driver.patch

@@ -1,4 +1,4 @@
-From ab53ad238214316a1c6feab8f6d85c06832e7a47 Mon Sep 17 00:00:00 2001
+From 07da654fcd16b2ae3a7a767ff89f87a3da94f22d Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:14:23 +0200
 Subject: [PATCH 43/50] net/pcs: add MediaTek MT7988 USXGMII PCS driver

patches/linux/6.18.37/0044-net-ethernet-mediatek-add-USXGMII-support-for-MT7988.patch

@@ -1,4 +1,4 @@
-From 5c7ae0ba30f846779eca1be5a9f36e1239ff74d8 Mon Sep 17 00:00:00 2001
+From f9cb160046a757abf5b081d6030011b54f3bc9b0 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:15:43 +0200
 Subject: [PATCH 44/50] net: ethernet: mediatek: add USXGMII support for MT7988

patches/linux/6.18.37/0045-arm64-dts-mediatek-mt7988a-add-USXGMII-PCS-nodes.patch

@@ -1,4 +1,4 @@
-From 6f05fd435c115a8bee19c93c22cf31ca1ecc89be Mon Sep 17 00:00:00 2001
+From 5cb31be412825eb8b95a79b89117587a8034d924 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:15:56 +0200
 Subject: [PATCH 45/50] arm64: dts: mediatek: mt7988a: add USXGMII PCS nodes

patches/linux/6.18.37/0046-arm64-dts-mediatek-bananapi-bpi-r4-enable-SFP-ports-.patch

@@ -1,4 +1,4 @@
-From 413263b811c631ae2ef984583590fd2297ef648a Mon Sep 17 00:00:00 2001
+From 58e5a335513c90e40ef4d6b0e0dff018d77dce84 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:16:11 +0200
 Subject: [PATCH 46/50] arm64: dts: mediatek: bananapi-bpi-r4: enable SFP+

patches/linux/6.18.37/0047-net-phy-sfp-add-OEM-SFP-10G-T-I-quirk.patch

@@ -1,4 +1,4 @@
-From d23cac53e2dbce4ce7f37aa8dd98dc5528bc45e0 Mon Sep 17 00:00:00 2001
+From 7528752150ebe1c29135d29d3a69b5c692771c18 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 7 Apr 2026 07:34:52 +0200
 Subject: [PATCH 47/50] net: phy: sfp: add OEM SFP-10G-T-I quirk

patches/linux/6.18.37/0048-net-dsa-mv88e6xxx-Trap-PTP-frames-on-timestamping-po.patch

@@ -1,4 +1,4 @@
-From 98bd974f7aedfa4a8181daa3f39867e480e097fa Mon Sep 17 00:00:00 2001
+From 51077597c4f3e458d4feb0ea36cc4ecbef3d635a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 17 Apr 2026 09:13:04 +0000
 Subject: [PATCH 48/50] net: dsa: mv88e6xxx: Trap PTP frames on timestamping

patches/linux/6.18.37/0049-wifi-mt76-mt7615-add-MODULE_DEVICE_TABLE-for-mt7622-.patch

@@ -1,4 +1,4 @@
-From a212af73720bb070c7b9a18e70985ea659ab0039 Mon Sep 17 00:00:00 2001
+From e5e0572d67cc4be9db0a4d4f7d5c1b973b12da8e Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 28 Apr 2026 15:30:01 +0200
 Subject: [PATCH 49/50] wifi: mt76: mt7615: add MODULE_DEVICE_TABLE for mt7622

patches/linux/6.18.37/0050-PCI-mediatek-gen3-Fix-PERST-control-timing-during-sy.patch

@@ -1,4 +1,4 @@
-From 6c7aca4d3d77be389ff4d533a9f7eed095442aad Mon Sep 17 00:00:00 2001
+From 29cd680b8b3b2089bbcb67ee36117459bc11919d Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 22 Apr 2026 10:24:43 +0200
 Subject: [PATCH 50/50] PCI: mediatek-gen3: Fix PERST# control timing during

patches/linux/linux.hash

@@ -1,2 +1,2 @@
 # Calculated with utils/kernel-refresh.sh
-sha256   fbab86c9f471c81075b280cca30bd85d790c060063a1245859b6344b07c9c44e  linux-6.18.36.tar.xz
+sha256   a83cd200e6646db52866b8309e9137b9e9048b613cbda10ced2b811aae125255  linux-6.18.37.tar.xz

src/confd/bin/gen-hostname

@@ -2,26 +2,20 @@
 # Generate ietf-system.yang hostname based on:
 #  1. Command line argument + MAC suffix
 #  2. Specific hostname from qemu_fw_cfg, from Qeneth
-#  3. /etc/hostname from squashfs + MAC suffix
+#  3. Default hostname + MAC suffix
+#
+# The MAC suffix is emitted as the %m format specifier, expanded by confd
+# at apply time, so the actual MAC never ends up baked into a saved
+# configuration (issue #1554).
 #
 set -e
 
-gen()
-{
-    base_mac=$(jq -r '.["mac-address"]' /run/system.json)
-    if [ -z "$base_mac" ] || [ "$base_mac" = "null" ]; then
-	base_mac=00:00:00:00:00:00
-    fi
-
-    echo "$1-$(echo $base_mac | tail -c 9 | tr ':' '-')"
-}
-
 if [ "$1" ]; then
-    sysname=$(gen "$1")
+    sysname="$1-%m"
 elif [ -f "/sys/firmware/qemu_fw_cfg/by_name/opt/hostname/raw" ]; then
     sysname="$(cat /sys/firmware/qemu_fw_cfg/by_name/opt/hostname/raw)"
 else
-    sysname=$(gen "$(cat /etc/hostname)")
+    sysname="%h-%m"
 fi
 
 cat <<EOF

src/confd/src/core.c

@@ -439,7 +439,7 @@ static confd_dependency_t dep_radio_components(struct lyd_node **diff, struct ly
 				class = lyd_get_value(class_node);
 		}
 
-		if (strcmp(class, "infix-hardware:wifi"))
+		if (!class || strcmp(class, "infix-hardware:wifi"))
 			continue;
 
 		/* Find all interfaces that reference this radio */

src/confd/src/hardware.c

@@ -237,7 +237,7 @@ static const char *wifi_find_higher_band_twin(struct lyd_node *config,
 {
 	struct lyd_node *cifs, *cif;
 
-	if (strcmp(current_band, "2.4GHz"))
+	if (!current_band || !current_ssid || strcmp(current_band, "2.4GHz"))
 		return NULL;
 
 	cifs = lydx_get_descendant(config, "interfaces", "interface", NULL);
@@ -252,13 +252,13 @@ static const char *wifi_find_higher_band_twin(struct lyd_node *config,
 		if (!ap)
 			continue;
 		ssid = lydx_get_cattr(ap, "ssid");
-		if (strcmp(ssid, current_ssid))
+		if (!ssid || strcmp(ssid, current_ssid))
 			continue;
 		radio = lydx_get_cattr(wifi, "radio");
 		radio_node = lydx_get_xpathf(config,
 			"/hardware/component[name='%s']/wifi-radio", radio);
 		band = lydx_get_cattr(radio_node, "band");
-		if (!strcmp(band, "5GHz") || !strcmp(band, "6GHz"))
+		if (band && (!strcmp(band, "5GHz") || !strcmp(band, "6GHz")))
 			return lydx_get_cattr(cif, "name");
 	}
 
@@ -1379,8 +1379,32 @@ int hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct l
 	 * all radio configs, so band edits and radio add/remove both apply.
 	 */
 	if (wifi_changed && event == SR_EV_DONE) {
+		struct lyd_node *cifs;
 		glob_t gl = { 0 };
+		size_t i;
 
+		/* Need to remove old hostapd config files, for radios not used anymore */
+		cifs = lydx_get_descendant(config, "interfaces", "interface", NULL);
+		if (glob("/etc/hostapd-*.conf", 0, NULL, &gl) == 0) {
+			for (i = 0; i < gl.gl_pathc; i++) {
+				char radio[64], **aps = NULL;
+				int n = 0, j;
+
+				if (sscanf(gl.gl_pathv[i], "/etc/hostapd-%63[^.].conf", radio) != 1)
+					continue;
+				wifi_find_radio_aps(cifs, radio, &aps, &n);
+				for (j = 0; j < n; j++)
+					free(aps[j]);
+				free(aps);
+				if (!n) {
+					unlink(gl.gl_pathv[i]);
+					erasef(HOSTAPD_CONF_NEXT, radio);
+				}
+			}
+			globfree(&gl);
+		}
+
+		gl = (glob_t){ 0 };
 		if (glob("/etc/hostapd-*.conf", 0, NULL, &gl) == 0 && gl.gl_pathc > 0) {
 			FILE *fp;
 
@@ -1389,8 +1413,6 @@ int hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct l
 				ERRNO("Could not open " HOSTAPD_SERVICE);
 				rc = SR_ERR_INTERNAL;
 			} else {
-				size_t i;
-
 				fprintf(fp, "# Generated by confd, do not edit.\n");
 				fprintf(fp, "service <!> name:hostapd \\\n");
 				fprintf(fp, "\t[2345] hostapd -P /run/hostapd.pid");

src/confd/src/ieee802-ethernet-interface.c

@@ -237,7 +237,7 @@ static int netdag_gen_ethtool_autoneg(struct dagger *net, struct lyd_node *cif)
 			err = -EINVAL;
 			goto out;
 		}
-		if (n != 1) {
+		if (n != 1 || !forced) {
 			sr_session_set_error_message(net->session,
 				"%s: auto-negotiation/enable=false requires exactly one "
 				"advertised-pmd-types entry (have %d)", ifname, n);

src/confd/src/if-wifi.c

@@ -283,7 +283,7 @@ static int wifi_center_chan_160(int ch)
  */
 static int wifi_chan_to_freq(int channel, const char *band)
 {
-	if (!strcmp(band, "6GHz"))
+	if (band && !strcmp(band, "6GHz"))
 		return 5950 + channel * 5;
 
 	if (channel >= 1 && channel <= 13)
@@ -392,7 +392,7 @@ int wifi_gen_mesh(struct lyd_node *cif)
 			int center = wifi_center_chan_80(channel);
 
 			fprintf(wpa_supplicant, "  ht40=1\n");
-			if (!strcmp(band, "6GHz"))
+			if (band && !strcmp(band, "6GHz"))
 				fprintf(wpa_supplicant, "  he=1\n");
 			else
 				fprintf(wpa_supplicant, "  vht=1\n");
@@ -403,7 +403,7 @@ int wifi_gen_mesh(struct lyd_node *cif)
 			int center = wifi_center_chan_160(channel);
 
 			fprintf(wpa_supplicant, "  ht40=1\n");
-			if (!strcmp(band, "6GHz"))
+			if (band && !strcmp(band, "6GHz"))
 				fprintf(wpa_supplicant, "  he=1\n");
 			else
 				fprintf(wpa_supplicant, "  vht=1\n");
@@ -540,7 +540,6 @@ out:
  */
 int wifi_del_iface(struct lyd_node *dif, struct dagger *net)
 {
-	struct lyd_node *wifi;
 	const char *ifname;
 	FILE *iw;
 
@@ -553,22 +552,14 @@ int wifi_del_iface(struct lyd_node *dif, struct dagger *net)
 	}
 
 	fprintf(iw, "# Generated by Infix confd - WiFi Interface Deletion\n");
+
+	erasef(WPA_SUPPLICANT_CONF, ifname);
+	fprintf(iw, "initctl -bfq disable mesh@%s\n", ifname);
+	fprintf(iw, "initctl -bfq disable wifi@%s\n", ifname);
+
 	fprintf(iw, "ip link set %s down\n", ifname);
 	fprintf(iw, "iw dev %s disconnect 2>/dev/null\n", ifname);
 	fprintf(iw, "iw dev %s del 2>/dev/null || ip link del %s 2>/dev/null || true\n", ifname, ifname);
-
-	wifi = lydx_get_child(dif, "wifi");
-	if (wifi) {
-		int mode = wifi_get_mode(wifi);
-
-		if (mode == wifi_mesh) {
-			erasef(WPA_SUPPLICANT_CONF, ifname);
-			fprintf(iw, "initctl -bfq disable mesh@%s\n", ifname);
-		} else if (mode != wifi_ap) {
-			erasef(WPA_SUPPLICANT_CONF, ifname);
-			fprintf(iw, "initctl -bfq disable wifi@%s\n", ifname);
-		}
-	}
 	fclose(iw);
 
 	return SR_ERR_OK;

test/case/all.yaml

@@ -17,9 +17,6 @@
   infamy:
     specification: False
 
-- name: "Miscellaneous"
-  suite: misc/all.yaml
-
 
 - name: "System"
   suite: system/all.yaml
@@ -62,3 +59,7 @@
 
 - name: "Use Case Tests"
   suite: use_case/all.yaml
+
+- name: "Miscellaneous"
+  suite: misc/all.yaml
+

test/case/interfaces/static_multicast_filters/test.py

@@ -133,7 +133,7 @@ with infamy.Test() as test:
 
             print("Starting IPv4 multicast sender")
             with mcast.MCastSender(send_ns, ipv4_multicast_group):
-                             
+
                 with test.step("Verify that 224.1.1.1 is flooded to host:data2 and host:data3"):
                     infamy.parallel(
                         lambda: receive_ns.must_receive(f"ip dst {ipv4_multicast_group}"),
@@ -143,30 +143,30 @@ with infamy.Test() as test:
                     set_static_multicast_filter(target, ipv4_multicast_group, mreceive)
                     until(lambda: iface.exist_bridge_multicast_filter(target, ipv4_multicast_group, mreceive, "br0"))
 
-                    with test.step("Verify that the group is still forwarded to host:data2"):
-                        receive_ns.must_receive(f"ip dst {ipv4_multicast_group}")
+                with test.step("Verify that the group is still forwarded to host:data2"):
+                    receive_ns.must_receive(f"ip dst {ipv4_multicast_group}")
 
-                    with test.step("Verify that the group is no longer forwarded to host:data3"):
-                        nojoin_ns.must_not_receive(f"ip dst {ipv4_multicast_group}")
+                with test.step("Verify that the group is no longer forwarded to host:data3"):
+                    nojoin_ns.must_not_receive(f"ip dst {ipv4_multicast_group}")
 
         with test.step("Start MAC multicast sender on host:data1, group 01:00:00:01:02:03"):
-            
+
             print("Starting MAC multicast sender")
             with mcast.MacMCastSender(send_ns, mac_multicast_group):
-                
+
                 with test.step("Verify MAC multicast 01:00:00:01:02:03 is flooded to host:data2 and host:data3"):
                     infamy.parallel(
                         lambda: receive_ns.must_receive(f"ether dst {mac_multicast_group}"),
                         lambda: nojoin_ns.must_receive(f"ether dst {mac_multicast_group}"))
-                    
+
                 with test.step("Enable MAC multicast filter on host:data2, group 01:00:00:01:02:03"):
                     set_static_multicast_filter(target, mac_multicast_group, mreceive)
                     until(lambda: iface.exist_bridge_multicast_filter(target, mac_multicast_group, mreceive, "br0"))
-                
-                    with test.step("Verify that the MAC group is still forwarded to host:data2"):
-                        receive_ns.must_receive(f"ether dst {mac_multicast_group}"),
-                                
-                    with test.step("Verify that the MAC group is no longer forwarded to host:data3"):
-                        nojoin_ns.must_not_receive(f"ether dst {mac_multicast_group}")
+
+                with test.step("Verify that the MAC group is still forwarded to host:data2"):
+                    receive_ns.must_receive(f"ether dst {mac_multicast_group}")
+
+                with test.step("Verify that the MAC group is no longer forwarded to host:data3"):
+                    nojoin_ns.must_not_receive(f"ether dst {mac_multicast_group}")
 
     test.succeed()

test/case/misc/operational_all/test.adoc

@@ -4,16 +4,27 @@ ifdef::topdoc[:imagesdir: {topdoc}../../test/case/misc/operational_all]
 
 ==== Description
 
-Basic test just to get operational from test-config without errors.
+Verify each device's operational datastore against its test-config.
+The running config is the source of truth, so the checks hold no matter
+how interfaces differ between devices:
 
-==== Topology
+  1. The operational interfaces are exactly the configured ones: none
+     missing, and none present that were never configured.
+  2. Features the test-config leaves disabled (NTP, containers, routing
+     protocols) emit no operational data.
 
-image::topology.svg[Get Operational topology, align=center, scaledwidth=75%]
+Both checks use specific-path GETs, which behave the same on NETCONF and
+RESTCONF.  A full-datastore GET is not portable: RESTCONF does not serve
+the operational datastore root, and NETCONF's operational provider errors
+when asked for an empty subtree.
+
+The test has no logical topology; it reads state from whatever DUTs the
+physical topology provides.
 
 ==== Sequence
 
-. Set up topology and attach to target DUT
-. Copy test-config to running configuration
-. Get all Operational data from 'target', verify there are no errors
+. Attach to all DUTs in the topology
+. Verify operational interfaces match the test-config
+. Verify unconfigured feature subtrees are absent
 
 

test/case/misc/operational_all/test.py

@@ -1,23 +1,112 @@
 #!/usr/bin/env python3
-
-# Test that it is possible to get all operational data
 """
 Get operational
 
-Basic test just to get operational from test-config without errors.
+Verify each device's operational datastore against its test-config.
+The running config is the source of truth, so the checks hold no matter
+how interfaces differ between devices:
+
+  1. The operational interfaces are exactly the configured ones: none
+     missing, and none present that were never configured.
+  2. Features the test-config leaves disabled (NTP, containers, routing
+     protocols) emit no operational data.
+
+Both checks use specific-path GETs, which behave the same on NETCONF and
+RESTCONF.  A full-datastore GET is not portable: RESTCONF does not serve
+the operational datastore root, and NETCONF's operational provider errors
+when asked for an empty subtree.
+
+The test has no logical topology; it reads state from whatever DUTs the
+physical topology provides.
 """
 import infamy
-import infamy.iface as iface
+from infamy.util import parallel, until
+
+# Feature subtrees that must be absent because the test-config does not
+# enable them.  /ietf-routing:routing itself is always present (its RIB
+# reflects the kernel's connected/local routes), so we target the
+# config-gated control-plane-protocols child rather than all of routing.
+ABSENT = [
+    "/ietf-ntp:ntp",
+    "/infix-containers:containers",
+    "/ietf-routing:routing/control-plane-protocols",
+]
+
+
+def configured_interfaces(dut):
+    cfg = dut.get_config_dict("/ietf-interfaces:interfaces")
+    return {i["name"] for i in cfg["interfaces"]["interface"]}
+
+
+def operational_interfaces(dut):
+    oper = dut.get_data("/ietf-interfaces:interfaces")["interfaces"]["interface"]
+    return {i["name"] for i in oper}
+
+
+def interfaces_match(name, dut, want):
+    """True once operational interfaces equal the configured set.
+
+    A preceding test (e.g. a container use_case) may leave veth endpoints
+    that are still being torn down when this test starts, so operational
+    momentarily carries interfaces that are not in the configuration.
+    Rather than asserting on that transient state, poll until the kernel,
+    and thus operational, has converged on the configured set.
+    """
+    have = operational_interfaces(dut)
+    if have != want:
+        print(f"{name}: operational {sorted(have)} != configured {sorted(want)}, waiting...")
+        return False
+    return True
+
+
+def absent(dut, xpath):
+    # RESTCONF returns nothing for an absent subtree; NETCONF's operational
+    # provider errors when asked for one.  Both mean "not present".
+    try:
+        return not dut.get_data(xpath)
+    except Exception:
+        return True
+
+
+def features_absent(name, dut):
+    """True once every unconfigured feature subtree is gone.
+
+    Like the interface set, these subtrees can momentarily linger: a
+    preceding test (containers, NTP, a routing protocol) leaves state that
+    yangerd only prunes once the underlying daemon/config is torn down.
+    Poll until operational has converged rather than asserting on the
+    transient overlap.
+    """
+    pending = [xpath for xpath in ABSENT if not absent(dut, xpath)]
+    if pending:
+        print(f"{name}: feature data still present {pending}, waiting...")
+        return False
+    return True
+
 
 with infamy.Test() as test:
-    with test.step("Set up topology and attach to target DUT"):
-        env = infamy.Env()
-        target = env.attach("target", "mgmt")
+    with test.step("Attach to all DUTs in the topology"):
+        env = infamy.Env(ltop=False)
+        infixen = env.ptop.get_infixen()
+        assert infixen, "no devices found in topology"
+        duts = dict(zip(infixen, parallel(*(lambda n=name: env.attach(n, "mgmt")
+                                            for name in infixen))))
 
-    with test.step("Copy test-config to running configuration"):
-        pass
+    with test.step("Verify operational interfaces match the test-config"):
+        def check(name, dut):
+            want = configured_interfaces(dut)
+            until(lambda: interfaces_match(name, dut, want), attempts=60)
 
-    with test.step("Get all Operational data from 'target', verify there are no errors"):
-        target.get_data(parse=False)
+        parallel(*(lambda n=name, d=dut: check(n, d) for name, dut in duts.items()))
+
+    with test.step("Verify unconfigured feature subtrees are absent"):
+        def check_absent(name, dut):
+            # NTP is pruned by a periodic collector with a 60s poll
+            # interval, so a stale subtree can take a full cycle to clear;
+            # wait comfortably past one interval rather than racing it.
+            until(lambda: features_absent(name, dut), attempts=120)
+
+        parallel(*(lambda n=name, d=dut: check_absent(n, d)
+                   for name, dut in duts.items()))
 
     test.succeed()

test/case/misc/operational_all/topology.dot

@@ -1 +0,0 @@
-../../../infamy/topologies/1x1.dot

test/case/misc/operational_all/topology.svg

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-
-<!-- Title: 1x1 Pages: 1 -->
-<svg width="424pt" height="45pt"
- viewBox="0.00 0.00 424.03 45.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 41)">
-<title>1x1</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-41 420.03,-41 420.03,4 -4,4"/>
-<!-- host -->
-<g id="node1" class="node">
-<title>host</title>
-<polygon fill="none" stroke="black" points="0,-0.5 0,-36.5 100,-36.5 100,-0.5 0,-0.5"/>
-<text text-anchor="middle" x="25" y="-14.8" font-family="DejaVu Sans Mono, Book" font-size="14.00">host</text>
-<polyline fill="none" stroke="black" points="50,-0.5 50,-36.5 "/>
-<text text-anchor="middle" x="75" y="-14.8" font-family="DejaVu Sans Mono, Book" font-size="14.00">mgmt</text>
-</g>
-<!-- target -->
-<g id="node2" class="node">
-<title>target</title>
-<polygon fill="none" stroke="black" points="300.03,-0.5 300.03,-36.5 416.03,-36.5 416.03,-0.5 300.03,-0.5"/>
-<text text-anchor="middle" x="325.03" y="-14.8" font-family="DejaVu Sans Mono, Book" font-size="14.00">mgmt</text>
-<polyline fill="none" stroke="black" points="350.03,-0.5 350.03,-36.5 "/>
-<text text-anchor="middle" x="383.03" y="-14.8" font-family="DejaVu Sans Mono, Book" font-size="14.00">target</text>
-</g>
-<!-- host&#45;&#45;target -->
-<g id="edge1" class="edge">
-<title>host:mgmt&#45;&#45;target:mgmt</title>
-<path fill="none" stroke="lightgray" stroke-width="2" d="M100,-18.5C100,-18.5 300.03,-18.5 300.03,-18.5"/>
-</g>
-</g>
-</svg>

test/case/routing/ospf_unnumbered_interface/test.py

@@ -186,7 +186,7 @@ with infamy.Test() as test:
         with test.step("Verify there are no OSPF HELLO packets on PC:data"):
             assert(route.ospf_get_interface_passive(R1, "0.0.0.0", R1data))
             print("Verify that no hello packets are recieved from passive interfaces")
-            ns0.must_not_receive("ip proto 89", timeout=15) # Default hello time 10s
+            ns0.must_not_receive("ip proto 89", duration=15) # Default hello time 10s
 
         with test.step("Test connectivity from PC:data to 192.168.200.1"):
             ns0.must_reach("192.168.200.1")

test/infamy/netns.py

@@ -62,6 +62,7 @@ class IsolatedMacVlans:
         self.ifmap, self.lo, self.set_up = ifmap, lo, set_up
         self.mode = mode
         self.ping_timeout = env.ENV.attr("ping_timeout", 5)
+        self.default_receive_duration = env.ENV.attr("default_receive_duration", 10)
 
     def start(self):
         self.sleeper = subprocess.Popen(["unshare", "-r", "-n", "sh", "-c",
@@ -86,7 +87,7 @@ class IsolatedMacVlans:
 
                 if self.set_up:
                     self.run(["ip", "link", "set", "dev", ifname, "up"])
-                    
+
         except Exception as e:
             self.__exit__(None, None, None)
             raise e
@@ -272,11 +273,11 @@ class IsolatedMacVlans:
 
         raise Exception(res)
 
-    def must_receive(self, expr, ifname, timeout=None, must=True):
-        timeout = timeout if timeout else self.ping_timeout
+    def must_receive(self, expr, ifname, duration=None, must=True):
+        duration = duration if duration else self.default_receive_duration
 
         tshark = self.run(["tshark", "-nl", f"-i{ifname}",
-                           f"-aduration:{timeout}", "-c1", expr],
+                           f"-aduration:{duration}", "-c1", expr],
                           stdin=subprocess.DEVNULL,
                           stdout=subprocess.PIPE,
                           stderr=subprocess.STDOUT,
@@ -336,9 +337,9 @@ class IsolatedMacVlan(IsolatedMacVlans):
         return super().addip(ifname=self._ifname, addr=addr,
                              prefix_length=prefix_length, proto=proto)
 
-    def must_receive(self, expr, timeout=None, ifname=None, must=True):
+    def must_receive(self, expr, duration=None, ifname=None, must=True):
         ifname = ifname if ifname else self._ifname
-        return super().must_receive(expr=expr, ifname=ifname, timeout=timeout, must=must)
+        return super().must_receive(expr=expr, ifname=ifname, duration=duration, must=must)
 
     def pcap(self, expr, ifname=None):
         ifname = ifname if ifname else self._ifname

test/spec/generate_spec.py

@@ -140,7 +140,9 @@ class TestCase:
         if title is None:
             title = visitor.name
 
-        self.gen_topology()
+        has_topology = os.path.exists(self.topo_dot)
+        if has_topology:
+            self.gen_topology()
 
         with open(self.spec_path, "w", encoding='utf-8') as spec:
             # This is the test name/title  for the test-specification.pdf,
@@ -156,8 +158,9 @@ class TestCase:
             spec.write("==== Description\n\n")
             spec.write(description + "\n\n")
 
-            spec.write("==== Topology\n\n")
-            spec.write(f"image::topology.svg[{title} topology, align=center, scaledwidth=75%]\n\n")
+            if has_topology:
+                spec.write("==== Topology\n\n")
+                spec.write(f"image::topology.svg[{title} topology, align=center, scaledwidth=75%]\n\n")
 
             spec.write("==== Sequence\n\n")
             spec.writelines([f". {step}\n" for step in test_steps])

utils/extract-changelog.sh

@@ -47,5 +47,5 @@ END { if (buf) print buf }
 cat <<EOF
 
 > [!TIP]
-> **Try Infix in GNS3!** Download the appliance from the [GNS3 Marketplace](https://gns3.com/marketplace/appliances/infix) to test Infix in a virtual network environment without hardware.
+> **Try Infix in GNS3!**  See the blog post for details <https://www.kernelkit.org/posts/infix-in-gns3/>
 EOF