From eb01d8fe7f5c053d7f6379c44ac176dae8d51bcf Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 7 Feb 2025 21:56:20 +0100
Subject: [PATCH] batman-adv: update to version 2025.0

* support latest kernels (5.4 - 6.14)
* handle VLAN 0 as untagged VLAN
* TT changes in OGMs no longer contain redundant TT changes
* coding style cleanups and refactoring
* bugs squashed:
  - fix incorrect offset in OGM handler for translation table TVLV
  - force stop of throughput detection workers on interface removal

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/Makefile                                   |  4 ++--
 ...atman-adv-move-asm-unaligned.h-to-linux-unal.patch | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 3c0544d..86e2c51 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2024.4
+PKG_VERSION:=2025.0
 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:=a554df6fc7abccc6b243f56ea7b184486c95ea986db1133f87aafe237da92f21
+PKG_HASH:=b90c4544d3cf39f6d7cd9206126b162f5110fbb4980de96d45fbcf5033d0851a
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
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
index d072f53..1c500c7 100644
--- 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
@@ -31,12 +31,19 @@ This reverts commit ee60832ebec47a023d634b06f9434103ec090aed.
 -#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,7 +7,7 @@
+@@ -7,6 +7,7 @@
  #include "distributed-arp-table.h"
  #include "main.h"
  
--#include <linux/unaligned.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>
-- 
2.30.2