From 0908d7d5a6244616d9152d9c6323c503b3edbc42 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 5 Apr 2024 21:35:20 +0200
Subject: [PATCH] batman-adv: update to version 2024.1

* support latest kernels (4.19 - 6.9)
* coding style cleanups and refactoring
* bugs squashed:
  - avoid infinite loop while trying to resize local translation table

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

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 2fed73a..125089d 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2024.0
-PKG_RELEASE:=2
+PKG_VERSION:=2024.1
+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:=61110697b5799f646a2a82a4dcf97faed4bb12a7cc43bf4683d2c4de4f6b40e7
+PKG_HASH:=a714329c6251f4830e9cf03f53cbfb2280f0678471b54c5d46fae61a782d4325
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
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 53c9d70..888b4ed 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
@@ -59,7 +59,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/bitops.h>
  #include <linux/bug.h>
-@@ -21,6 +20,7 @@
+@@ -20,6 +19,7 @@
  #include <linux/if_ether.h>
  #include <linux/if_vlan.h>
  #include <linux/init.h>
-- 
2.30.2