From e061c1bf842113819c4274bcf1601552d8454d8d Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 15 Oct 2024 21:02:59 +0200
Subject: [PATCH] batman-adv: update to version 2024.3

* support latest kernels (4.19 - 6.12)
* coding style cleanups and refactoring
* bugs squashed:
  - avoid processing of translation table updates for out-of-spec VIDs

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

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 0b2000929..328b13519 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2024.2
+PKG_VERSION:=2024.3
 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:=7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643
+PKG_HASH:=b96817ed1f4f48917c32550a84faad8c87ecf53aa6f6f46cc26554b999b57ff3
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
diff --git a/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch b/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
index 30d30d042..5f85db086 100644
--- a/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
+++ b/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
@@ -175,7 +175,7 @@ This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
  #include <linux/lockdep.h>
 --- a/net/batman-adv/originator.c
 +++ b/net/batman-adv/originator.c
-@@ -8,11 +8,11 @@
+@@ -8,12 +8,12 @@
  #include "main.h"
  
  #include <linux/atomic.h>
@@ -183,6 +183,7 @@ This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
  #include <linux/errno.h>
  #include <linux/etherdevice.h>
  #include <linux/gfp.h>
+ #include <linux/if_vlan.h>
  #include <linux/jiffies.h>
 +#include <linux/kernel.h>
  #include <linux/kref.h>