batman-adv: update to version 2025.2

* support latest kernels (5.4 - 6.16)
* coding style cleanups and refactoring
* bugs squashed:
  - fix duplicate MAC address check

Signed-off-by: Sven Eckelmann <[email protected]>

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 2ea2cbed9f71ee5894892edf61ec1af3d0bd2601..ab54f4345af986875ee565f90befd4a15cc9eac3 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2025.1
+PKG_VERSION:=2025.2
 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:=03ad429297961fb3acd9c2c806432d037b0ed7aac0f0a1e645e32af5210b98e1
+PKG_HASH:=16c45f8bb8f305371cd90e888630cfb251c2b189e5532a527a936fa35ba497f7
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <[email protected]>

diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h
index 5d536a8d76921cdfb9f0d06028799e1953069d58..57911f47511948c9ddcc667fd4f3eb44052839a0 100644 (file)
--- a/batman-adv/src/compat-hacks.h
+++ b/batman-adv/src/compat-hacks.h
@@ -11,6 +11,17 @@
 
 #endif /* LINUX_VERSION_IS_LESS(6, 10, 0) */
 
+#if LINUX_VERSION_IS_LESS(6, 15, 0)
+#include <linux/crc32c.h>
+#endif /* LINUX_VERSION_IS_LESS(6, 15, 0) */
+
+#if LINUX_VERSION_IS_LESS(6, 16, 0)
+
+#define timer_container_of(var, callback_timer, timer_fieldname)       \
+       from_timer(var, callback_timer, timer_fieldname)
+
+#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) */
+
 /* <DECLARE_EWMA> */
 
 #include <linux/version.h>