From aa449f8d78ad96a13bc3e8b8198de19b6c52ba35 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 8 Apr 2026 14:05:27 +0200 Subject: [PATCH] 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