openwrt/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2026-04-15 10:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

batman-adv: update to version 2025.5

Browse Source 
* support latest kernels (5.10 - 6.19)
* coding style cleanups and refactoring

Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann
2025-12-20 18:30:59 +01:00
parent b43e4ac560
commit b8bd615397
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
batman-adv/Makefile
View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2025.4 PKG_VERSION:=2025.5
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) 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_EXTMOD_SUBDIRS:=net/batman-adv
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de> PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

7
batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
View File

@@ -10,7 +10,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
--- a/compat-include/linux/array_size.h --- a/compat-include/linux/array_size.h
+++ /dev/null +++ /dev/null
@@ -1,20 +0,0 @@ @@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */ -/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) B.A.T.M.A.N. contributors: -/* 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_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_
- -
-#include <linux/version.h> -#include <linux/version.h>
-#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 <linux/array_size.h> -#include_next <linux/array_size.h>
-#else -#else
-#include <linux/kernel.h> -#include <linux/kernel.h>

30
batman-adv/src/compat-hacks.h
View File

@@ -22,6 +22,36 @@
#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) */ #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> */ /* <DECLARE_EWMA> */
#include <linux/version.h> #include <linux/version.h>