From e6cebf66cfa83c27d62ecaec6d5a7450d272857d Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 22 Jun 2024 21:33:40 +0200
Subject: [PATCH] batman-adv: update to version 2024.2

* support latest kernels (4.19 - 6.10)
* coding style cleanups and refactoring

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                                           | 4 ++--
 .../0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch    | 2 +-
 .../0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 125089d..0b20009 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2024.1
+PKG_VERSION:=2024.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:=a714329c6251f4830e9cf03f53cbfb2280f0678471b54c5d46fae61a782d4325
+PKG_HASH:=7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
diff --git a/batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch b/batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch
index 3692433..e072f56 100644
--- a/batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch
+++ b/batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch
@@ -69,7 +69,7 @@ This reverts commit f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86.
  #include <net/sock.h>
 --- a/net/batman-adv/main.c
 +++ b/net/batman-adv/main.c
-@@ -32,7 +32,6 @@
+@@ -31,7 +31,6 @@
  #include <linux/skbuff.h>
  #include <linux/slab.h>
  #include <linux/spinlock.h>
diff --git a/batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch b/batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch
index 888b4ed..838cc93 100644
--- a/batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch
+++ b/batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch
@@ -41,7 +41,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/build_bug.h>
  #include <linux/byteorder/generic.h>
-@@ -20,6 +19,7 @@
+@@ -19,6 +18,7 @@
  #include <linux/init.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>
@@ -59,7 +59,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/bitops.h>
  #include <linux/bug.h>
-@@ -20,6 +19,7 @@
+@@ -19,6 +18,7 @@
  #include <linux/if_ether.h>
  #include <linux/if_vlan.h>
  #include <linux/init.h>
-- 
2.30.2