From b8bd615397624ed6eed1fb56577c7d7394720c09 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 20 Dec 2025 18:30:59 +0100 Subject: [PATCH 1/4] batman-adv: update to version 2025.5 * support latest kernels (5.10 - 6.19) * coding style cleanups and refactoring Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 4 +-- ...man-adv-Switch-to-linux-array_size.h.patch | 7 +++-- batman-adv/src/compat-hacks.h | 30 +++++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 394f1e1..c61ed09 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2025.4 +PKG_VERSION:=2025.5 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:=62490a8f8b58c02e819216f3e963249984645d3e460156a043b73fc53e24f86d +PKG_HASH:=1adbe823991e9718e307f3766ea96405fe1f284c19bcb98c662d7a1faa324c35 PKG_EXTMOD_SUBDIRS:=net/batman-adv PKG_MAINTAINER:=Simon Wunderlich diff --git a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch index cbc4042..acf6827 100644 --- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch +++ b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch @@ -10,7 +10,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2. --- a/compat-include/linux/array_size.h +++ /dev/null -@@ -1,20 +0,0 @@ +@@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) B.A.T.M.A.N. contributors: - * @@ -24,7 +24,10 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2. -#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ - -#include --#if LINUX_VERSION_IS_GEQ(6, 7, 0) +-#if (LINUX_VERSION_IS_GEQ(5, 15, 197) && LINUX_VERSION_IS_LESS(5, 16, 0)) || \ +- (LINUX_VERSION_IS_GEQ(6, 1, 159) && LINUX_VERSION_IS_LESS(6, 2, 0)) || \ +- (LINUX_VERSION_IS_GEQ(6, 6, 118) && LINUX_VERSION_IS_LESS(6, 7, 0)) || \ +- LINUX_VERSION_IS_GEQ(6, 7, 0) -#include_next -#else -#include diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 57911f4..3df7042 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -22,6 +22,36 @@ #endif /* LINUX_VERSION_IS_LESS(6, 16, 0) */ +#if LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C) + +#include +#include + +static inline u32 batadv_skb_crc32c(struct sk_buff *skb, int offset, + int len, u32 crc) +{ + unsigned int to = offset + len; + unsigned int consumed = 0; + struct skb_seq_state st; + unsigned int l; + const u8 *data; + + if (len <= 0) + return crc; + + skb_prepare_seq_read(skb, offset, to, &st); + while ((l = skb_seq_read(consumed, &data, &st)) != 0) { + crc = crc32c(crc, data, l); + consumed += l; + } + + return crc; +} + +#define skb_crc32c batadv_skb_crc32c + +#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C) */ + /* */ #include From 1d4204aee6d7ba9b4a6a9f1c54ca6e5fa7339131 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 20 Dec 2025 18:30:59 +0100 Subject: [PATCH 2/4] alfred: update to version 2025.5 * (no changes) Signed-off-by: Sven Eckelmann --- alfred/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index b2afeaf..0715157 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -PKG_VERSION:=2025.4 -PKG_RELEASE:=2 +PKG_VERSION:=2025.5 +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:=8375475478ed1cd4139c9000175a7d1407ee8dd919a0b7c9dbf7d15095880485 +PKG_HASH:=75c12c1c3c39cdb2246f61fca5d4d9f61e240fe2827129fab7a03deef855ffe8 PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only MIT From 091138d5b372b6cf55b11fcd374ac9334996b7ab Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 20 Dec 2025 18:30:59 +0100 Subject: [PATCH 3/4] batctl: update to version 2025.5 * (no changes) Signed-off-by: Sven Eckelmann --- batctl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index 771e0ef..8eaa54a 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2025.4 +PKG_VERSION:=2025.5 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:=566aa4fd74355e8d5dd2bd21c25e98cc068e77fd08e19f80b8e2b5edde7c8e65 +PKG_HASH:=1e0bcd49f92eeda0d76bc683562adf366024e2ee4c199fa402036f6b93cbb147 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich From e8d322e2167f7dc337e41ab53b02ab4e09925c35 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 20 Dec 2025 18:34:33 +0100 Subject: [PATCH 4/4] batman-adv: drop support for kernels < 6.12 OpenWrt only supports Linux 6.12 at the moment. It is no longer necessary to support older versions of the kernel. Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 2 +- ...man-adv-Switch-to-linux-array_size.h.patch | 72 ------------------- ...v-move-asm-unaligned.h-to-linux-unal.patch | 49 ------------- batman-adv/src/compat-hacks.h | 6 -- 4 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch delete mode 100644 batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch diff --git a/batman-adv/Makefile b/batman-adv/Makefile index c61ed09..7a8d1d7 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2025.5 -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) diff --git a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch deleted file mode 100644 index acf6827..0000000 --- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Sven Eckelmann -Date: Fri, 2 Feb 2024 22:49:48 +0100 -Subject: Revert "batman-adv: Switch to linux/array_size.h" - -The original patch requires Linux 6.7.0 or a mac80211 compat header with this -name. But the mac80211 package is currently not providing this header and -OpenWrt main is still using older Linux kernel versions for some targets. - -This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2. - ---- a/compat-include/linux/array_size.h -+++ /dev/null -@@ -1,23 +0,0 @@ --/* SPDX-License-Identifier: GPL-2.0 */ --/* Copyright (C) B.A.T.M.A.N. contributors: -- * -- * Marek Lindner, Simon Wunderlich -- * -- * This file contains macros for maintaining compatibility with older versions -- * of the Linux kernel. -- */ -- --#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ --#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ -- --#include --#if (LINUX_VERSION_IS_GEQ(5, 15, 197) && LINUX_VERSION_IS_LESS(5, 16, 0)) || \ -- (LINUX_VERSION_IS_GEQ(6, 1, 159) && LINUX_VERSION_IS_LESS(6, 2, 0)) || \ -- (LINUX_VERSION_IS_GEQ(6, 6, 118) && LINUX_VERSION_IS_LESS(6, 7, 0)) || \ -- LINUX_VERSION_IS_GEQ(6, 7, 0) --#include_next --#else --#include --#endif -- --#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ */ ---- a/net/batman-adv/main.c -+++ b/net/batman-adv/main.c -@@ -6,7 +6,6 @@ - - #include "main.h" - --#include - #include - #include - #include -@@ -19,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/net/batman-adv/netlink.c -+++ b/net/batman-adv/netlink.c -@@ -7,7 +7,6 @@ - #include "netlink.h" - #include "main.h" - --#include - #include - #include - #include -@@ -19,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch b/batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch deleted file mode 100644 index 1c500c7..0000000 --- a/batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Sven Eckelmann -Date: Tue, 10 Dec 2024 22:31:33 +0100 -Subject: Revert "batman-adv: move asm/unaligned.h to linux/unaligned.h" - -This header is only available with Linux 6.12 - -This reverts commit ee60832ebec47a023d634b06f9434103ec090aed. - ---- a/compat-include/linux/unaligned.h -+++ /dev/null -@@ -1,20 +0,0 @@ --/* SPDX-License-Identifier: GPL-2.0 */ --/* Copyright (C) B.A.T.M.A.N. contributors: -- * -- * Marek Lindner, Simon Wunderlich -- * -- * This file contains macros for maintaining compatibility with older versions -- * of the Linux kernel. -- */ -- --#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ --#define _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ -- --#include --#if LINUX_VERSION_IS_GEQ(6, 12, 0) --#include_next --#else --#include --#endif -- --#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ */ ---- a/net/batman-adv/distributed-arp-table.c -+++ b/net/batman-adv/distributed-arp-table.c -@@ -7,6 +7,7 @@ - #include "distributed-arp-table.h" - #include "main.h" - -+#include - #include - #include - #include -@@ -32,7 +33,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 3df7042..7b6b116 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -5,12 +5,6 @@ #include /* LINUX_VERSION_CODE */ #include -#if LINUX_VERSION_IS_LESS(6, 10, 0) - -#define __counted_by_be(member) - -#endif /* LINUX_VERSION_IS_LESS(6, 10, 0) */ - #if LINUX_VERSION_IS_LESS(6, 15, 0) #include #endif /* LINUX_VERSION_IS_LESS(6, 15, 0) */