package/batman-adv: bump to version 2024.4

We can drop patches 0001, 0003 and 0004 as they are upstream. 0002 is
renumbered to 0001.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>

package/batman-adv/0001-batman-adv-move-asm-unaligned.h-to-linux-unaligned.h.patch

@@ -1,74 +0,0 @@
-From 3b434d5878131cd45aa5c4dd906fe0e569b445d6 Mon Sep 17 00:00:00 2001
-From: Al Viro <viro@zeniv.linux.org.uk>
-Date: Tue, 1 Oct 2024 15:35:57 -0400
-Subject: [PATCH] batman-adv: move asm/unaligned.h to linux/unaligned.h
-
-asm/unaligned.h is always an include of asm-generic/unaligned.h;
-might as well move that thing to linux/unaligned.h and include
-that - there's nothing arch-specific in that header.
-
-auto-generated by the following:
-
-for i in `git grep -l -w asm/unaligned.h`; do
-	sed -i -e "s/asm\/unaligned.h/linux\/unaligned.h/" $i
-done
-for i in `git grep -l -w asm-generic/unaligned.h`; do
-	sed -i -e "s/asm-generic\/unaligned.h/linux\/unaligned.h/" $i
-done
-git mv include/asm-generic/unaligned.h include/linux/unaligned.h
-git mv tools/include/asm-generic/unaligned.h tools/include/linux/unaligned.h
-sed -i -e "/unaligned.h/d" include/asm-generic/Kbuild
-sed -i -e "s/__ASM_GENERIC/__LINUX/" include/linux/unaligned.h tools/include/linux/unaligned.h
-
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Upstream: https://git.open-mesh.org/batman-adv.git/commit/ee60832ebec47a023d634b06f9434103ec090aed
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- compat-include/linux/unaligned.h       | 20 ++++++++++++++++++++
- net/batman-adv/distributed-arp-table.c |  2 +-
- 2 files changed, 21 insertions(+), 1 deletion(-)
- create mode 100644 compat-include/linux/unaligned.h
-
-diff --git a/compat-include/linux/unaligned.h b/compat-include/linux/unaligned.h
-new file mode 100644
-index 00000000..66d86646
---- /dev/null
-+++ b/compat-include/linux/unaligned.h
-@@ -0,0 +1,20 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/* Copyright (C) B.A.T.M.A.N. contributors:
-+ *
-+ * Marek Lindner, Simon Wunderlich
-+ *
-+ * This file contains macros for maintaining compatibility with older versions
-+ * of the Linux kernel.
-+ */
-+
-+#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_
-+#define _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_
-+
-+#include <linux/version.h>
-+#if LINUX_VERSION_IS_GEQ(6, 12, 0)
-+#include_next <linux/unaligned.h>
-+#else
-+#include <asm/unaligned.h>
-+#endif
-+
-+#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ */
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 4c7e8553..801eff8a 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -7,7 +7,7 @@
- #include "distributed-arp-table.h"
- #include "main.h"
- 
--#include <asm/unaligned.h>
-+#include <linux/unaligned.h>
- #include <linux/atomic.h>
- #include <linux/bitops.h>
- #include <linux/byteorder/generic.h>
--- 
-2.47.1
-

package/batman-adv/0003-batman-adv-convert-NETIF_F_LLTX-to-dev-lltx.patch

@@ -1,40 +0,0 @@
-From e8d6208a41c9b9912cac60ebad57d7dbe4b9786c Mon Sep 17 00:00:00 2001
-From: Alexander Lobakin <aleksander.lobakin@intel.com>
-Date: Thu, 29 Aug 2024 14:33:37 +0200
-Subject: [PATCH] batman-adv: convert NETIF_F_LLTX to dev->lltx
-
-NETIF_F_LLTX can't be changed via Ethtool and is not a feature,
-rather an attribute, very similar to IFF_NO_QUEUE (and hot).
-Free one netdev_features_t bit and make it a "hot" private flag.
-
-Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-[sven@narfation.org: add compat code]
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Upstream: https://git.open-mesh.org/batman-adv.git/commit/b6d2c16d1a5f90e1aff1ca55d73ba4e7be03c2a0
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- net/batman-adv/soft-interface.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 30ecbc2e..48cf3bd9 100644
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -1021,8 +1021,12 @@ static void batadv_softif_init_early(struct net_device *dev)
- 	dev->needs_free_netdev = true;
- 	dev->priv_destructor = batadv_softif_free;
- 	dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_NETNS_LOCAL;
--	dev->features |= NETIF_F_LLTX;
- 	dev->priv_flags |= IFF_NO_QUEUE;
-+#if LINUX_VERSION_IS_GEQ(6, 12, 0) // UGLY_HACK_NEW
-+	dev->lltx = true;
-+#else // UGLY_HACK_OLD
-+	dev->features |= NETIF_F_LLTX;
-+#endif // UGLY_HACK_STOP
- 
- 	/* can't call min_mtu, because the needed variables
- 	 * have not been initialized yet
--- 
-2.47.1
-

package/batman-adv/0004-batman-adv-convert-NETIF_F_NETNS_LOCAL-to-dev-netns_.patch

@@ -1,43 +0,0 @@
-From 5315fd6f4db07dfb5c25949a3c7ac607feff863e Mon Sep 17 00:00:00 2001
-From: Alexander Lobakin <aleksander.lobakin@intel.com>
-Date: Thu, 29 Aug 2024 14:33:38 +0200
-Subject: [PATCH] batman-adv: convert NETIF_F_NETNS_LOCAL to dev->netns_local
-
-"Interface can't change network namespaces" is rather an attribute,
-not a feature, and it can't be changed via Ethtool.
-Make it a "cold" private flag instead of a netdev_feature and free
-one more bit.
-
-Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-[sven@narfation.org: add compat code]
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Upstream: https://git.open-mesh.org/batman-adv.git/commit/b0405a97957978a0aa46dde55d590e1cf0f4309e
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- net/batman-adv/soft-interface.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 48cf3bd9..610bbaaa 100644
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -1020,12 +1020,13 @@ static void batadv_softif_init_early(struct net_device *dev)
- 	dev->netdev_ops = &batadv_netdev_ops;
- 	dev->needs_free_netdev = true;
- 	dev->priv_destructor = batadv_softif_free;
--	dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_NETNS_LOCAL;
-+	dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
- 	dev->priv_flags |= IFF_NO_QUEUE;
- #if LINUX_VERSION_IS_GEQ(6, 12, 0) // UGLY_HACK_NEW
- 	dev->lltx = true;
-+	dev->netns_local = true;
- #else // UGLY_HACK_OLD
--	dev->features |= NETIF_F_LLTX;
-+	dev->features |= NETIF_F_LLTX | NETIF_F_NETNS_LOCAL;
- #endif // UGLY_HACK_STOP
- 
- 	/* can't call min_mtu, because the needed variables
--- 
-2.47.1
-

package/batman-adv/batman-adv.hash

@@ -1,7 +1,7 @@
-# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz.sha1
-sha1  de2a55d8d15b350efa6e6d3e6d29b6e3a6f4c04f  batman-adv-2024.2.tar.gz
+# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.4.tar.gz.sha1
+sha1  36bdc78a00bfa51d8afa689be1b651b9da9f8860  batman-adv-2024.4.tar.gz
 # locally computed
-sha256  7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643  batman-adv-2024.2.tar.gz
+sha256  a554df6fc7abccc6b243f56ea7b184486c95ea986db1133f87aafe237da92f21  batman-adv-2024.4.tar.gz
 
 # Hash for license files
 sha256  cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025  LICENSES/preferred/GPL-2.0

package/batman-adv/batman-adv.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BATMAN_ADV_VERSION = 2024.2
+BATMAN_ADV_VERSION = 2024.4
 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
 BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
 BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT