diff --git a/alfred/Makefile b/alfred/Makefile index 848f432..7ffd13c 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -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:=7fb8b3f1cc4ec488e8d43fd915dda0a7cdf5b611bf39d60ddeb4486ac0025f18 +PKG_HASH:=4347d1e4b0794afbf6b171a857b9a3c7d51a291fc54f16cdad92c7f7d1cdb51a PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only MIT diff --git a/batctl/Makefile b/batctl/Makefile index 8809fac..2acbbbb 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -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:=20f8a2e135a078aac16e5c8ad535a12a155cf0b79af183de5fb17da957bc2478 +PKG_HASH:=ab6c0346a16f111e7b9fd5ce55ccddeb7de0ad7742be2f451317eb428f6a0a96 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 2ea2cbe..ab54f43 100644 --- 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 diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 5d536a8..57911f4 100644 --- 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 +#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) */ + /* */ #include