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 <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only MIT
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 <sw@simonwunderlich.de>
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 394f1e1..7a8d1d7 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_RELEASE:=1
+PKG_VERSION:=2025.5
+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)
-PKG_HASH:=62490a8f8b58c02e819216f3e963249984645d3e460156a043b73fc53e24f86d
+PKG_HASH:=1adbe823991e9718e307f3766ea96405fe1f284c19bcb98c662d7a1faa324c35
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
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 cbc4042..0000000
--- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-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,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_ARRAY_SIZE_H_
--#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_
--
--#include <linux/version.h>
--#if LINUX_VERSION_IS_GEQ(6, 7, 0)
--#include_next <linux/array_size.h>
--#else
--#include <linux/kernel.h>
--#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 <linux/array_size.h>
- #include <linux/atomic.h>
- #include <linux/build_bug.h>
- #include <linux/byteorder/generic.h>
-@@ -19,6 +18,7 @@
- #include <linux/init.h>
- #include <linux/ip.h>
- #include <linux/ipv6.h>
-+#include <linux/kernel.h>
- #include <linux/kobject.h>
- #include <linux/kref.h>
- #include <linux/list.h>
---- a/net/batman-adv/netlink.c
-+++ b/net/batman-adv/netlink.c
-@@ -7,7 +7,6 @@
- #include "netlink.h"
- #include "main.h"
- 
--#include <linux/array_size.h>
- #include <linux/atomic.h>
- #include <linux/bitops.h>
- #include <linux/bug.h>
-@@ -19,6 +18,7 @@
- #include <linux/if_ether.h>
- #include <linux/if_vlan.h>
- #include <linux/init.h>
-+#include <linux/kernel.h>
- #include <linux/limits.h>
- #include <linux/minmax.h>
- #include <linux/netdevice.h>
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 <sven@narfation.org>
-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 <linux/version.h>
--#if LINUX_VERSION_IS_GEQ(6, 12, 0)
--#include_next <linux/unaligned.h>
--#else
--#include <asm/unaligned.h>
--#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 <asm/unaligned.h>
- #include <linux/atomic.h>
- #include <linux/bitops.h>
- #include <linux/byteorder/generic.h>
-@@ -32,7 +33,6 @@
- #include <linux/stddef.h>
- #include <linux/string.h>
- #include <linux/udp.h>
--#include <linux/unaligned.h>
- #include <linux/workqueue.h>
- #include <net/arp.h>
- #include <net/genetlink.h>
diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h
index 57911f4..7b6b116 100644
--- a/batman-adv/src/compat-hacks.h
+++ b/batman-adv/src/compat-hacks.h
@@ -5,12 +5,6 @@
 #include <linux/version.h>	/* LINUX_VERSION_CODE */
 #include <linux/types.h>
 
-#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 <linux/crc32c.h>
 #endif /* LINUX_VERSION_IS_LESS(6, 15, 0) */
@@ -22,6 +16,36 @@
 
 #endif /* LINUX_VERSION_IS_LESS(6, 16, 0) */
 
+#if LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C)
+
+#include <linux/skbuff.h>
+#include <linux/crc32.h>
+
+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) */
+
 /* <DECLARE_EWMA> */
 
 #include <linux/version.h>