From b068156976b335567b14d39f274a0695c5e0201b Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 8 Apr 2026 14:04:48 +0200 Subject: [PATCH 1/4] alfred: update to version 2026.1 * coding style cleanups and refactoring * bugs squashed: - fix printing of timespec Signed-off-by: Sven Eckelmann --- alfred/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 3443f26..7eefd61 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -PKG_VERSION:=2026.0 +PKG_VERSION:=2026.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=df91152fe31fb6377a24ce93130445973510469af9377e4cc9c5f5d25e38e751 +PKG_HASH:=45dfbcb8a7cbbaaee3e12607a46601dd86ce5225072535e9b49da40bbf02b489 PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only MIT From 6830873a5befef1d4711645cdd4d06582c68c926 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 8 Apr 2026 14:05:27 +0200 Subject: [PATCH 2/4] batctl: update to version 2026.1 * coding style cleanups and refactoring * bugs squashed: - tcpdump: Fix printing of usecs - fix tbl preprocessing of manpage Signed-off-by: Sven Eckelmann --- batctl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index 2252742..104a461 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2026.0 +PKG_VERSION:=2026.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=b4b70dae620106e45ee3ddb1f512f69075692b12343d0521267403cb212a4a26 +PKG_HASH:=84441686c1d44ed57a560f2a0be9f86eb92c310f22aaa4a00933eb6c8936087a PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich From aa449f8d78ad96a13bc3e8b8198de19b6c52ba35 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 8 Apr 2026 14:05:27 +0200 Subject: [PATCH 3/4] batman-adv: update to version 2026.1 * support latest kernels (5.10 - 7.1) * coding style cleanups and refactoring * bugs squashed: - reject oversized global TT response buffers - avoid OGM aggregation when skb tailroom is insufficient - prevent freed backbones when dumping BLA claims Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 6 +++--- batman-adv/src/compat-hacks.h | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index a249bef..ef2626b 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2026.0 -PKG_RELEASE:=2 +PKG_VERSION:=2026.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=9461d613c4f83a0a233a9f7006ad6d15e779d789c49bd35e3cc08d7e2886fcaa +PKG_HASH:=6487dd3b4ad0f85510dedbba335fe77b1b877d0e77393c51ddca07a7451b8f45 PKG_EXTMOD_SUBDIRS:=net/batman-adv PKG_MAINTAINER:=Simon Wunderlich diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 7b6b116..e3bc5ee 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -46,6 +46,19 @@ static inline u32 batadv_skb_crc32c(struct sk_buff *skb, int offset, #endif /* LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0) + +#define kzalloc_obj(P, GFP) \ + kzalloc(sizeof(P), GFP) + +#define kmalloc_obj(P, GFP) \ + kmalloc(sizeof(P), GFP) + +#define kmalloc_objs(P, COUNT, GFP) \ + kmalloc_array((COUNT), sizeof(P), GFP) + +#endif /* < KERNEL_VERSION(7, 0, 0) */ + /* */ #include From 61466d6639b9a1afe727d16461edacfa53e3f77e Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 8 Apr 2026 21:17:16 +0200 Subject: [PATCH 4/4] batman-adv: fix build against Linux 6.18 The EXTRA_CFLAGS for batman-adv were not applied with Linux 6.18. As result, C files for a specific features were build but the datastructures were missing the members for this specific feature. This can be avoided by switching to a more modern way of setting up the make command (like in this case "mt76"). Besides simplifying and cleaning up the code, it is now also directly providing the CONFIG preprocessor variables as part of NOSTDINC_FLAGS. This works on the current kernel versions 6.12 (default) and 6.18 (testing). Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index ef2626b..86ca1d3 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2026.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -56,7 +56,7 @@ define Package/kmod-batman-adv/conffiles /etc/config/batman-adv endef -PKG_EXTRA_KCONFIG:= \ +PKG_MAKE_FLAGS:= \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEBUG),y,n) \ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_BLA),y,n) \ @@ -65,29 +65,26 @@ PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \ CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_TRACING),y,n) \ -PKG_EXTRA_CFLAGS:= \ - $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ - $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \ - -NOSTDINC_FLAGS = \ +NOSTDINC_FLAGS := \ $(KERNEL_NOSTDINC_FLAGS) \ - -I$(PKG_BUILD_DIR)/net/batman-adv \ - -I$(STAGING_DIR)/usr/include/mac80211-backport \ - -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ - -I$(STAGING_DIR)/usr/include/mac80211 \ - -I$(STAGING_DIR)/usr/include/mac80211/uapi \ -I$(PKG_BUILD_DIR)/include/ \ + -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ + -I$(STAGING_DIR)/usr/include/mac80211-backport \ + -I$(STAGING_DIR)/usr/include/mac80211/uapi \ + -I$(STAGING_DIR)/usr/include/mac80211 \ -include backport/autoconf.h \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ -DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)-openwrt-$(PKG_RELEASE)\\\" +NOSTDINC_FLAGS += \ + $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_MAKE_FLAGS)))) \ + $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_MAKE_FLAGS)))) \ + define Build/Compile - $(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ - $(KERNEL_MAKE_FLAGS) \ + +$(KERNEL_MAKE) $(PKG_JOBS) \ + $(PKG_MAKE_FLAGS) \ M="$(PKG_BUILD_DIR)/net/batman-adv" \ - $(PKG_EXTRA_KCONFIG) \ - EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ modules endef