Merge pull request #6 from 1054009064/batman-adv

batman-adv: update to version 2022.3
2025-01-08 11:47:39 +08:00 · 2022-11-27 01:06:24 +08:00 · 2022-11-27 01:06:24 +08:00 · 5437d2c91f
commit 5437d2c91f
parent b3a1e59542 422aca1132
10 changed files with 417 additions and 130 deletions
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=batman-adv
-PKG_VERSION:=2022.0
+PKG_VERSION:=2022.3
 PKG_RELEASE:=$(AUTORELEASE)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=49338705bc207709ac84d766688e702571009c827c0a320788ea51fb887714aa
+PKG_HASH:=218ffb534fead1c9b5b0d90ec1b2fba688209cdf00e861bece1cbf469fe69953
 PKG_EXTMOD_SUBDIRS:=net/batman-adv

 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
@ -19,6 +19,15 @@ PKG_BUILD_PARALLEL:=1

 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h

+PKG_CONFIG_DEPENDS += \
+	CONFIG_BATMAN_ADV_BATMAN_V \
+	CONFIG_BATMAN_ADV_BLA \
+	CONFIG_BATMAN_ADV_DAT \
+	CONFIG_BATMAN_ADV_NC \
+	CONFIG_BATMAN_ADV_MCAST \
+	CONFIG_BATMAN_ADV_DEBUG \
+	CONFIG_BATMAN_ADV_TRACING
+
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk

--- a/batman-adv/patches/0001-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
+++ b/batman-adv/patches/0001-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
@ -7,7 +7,7 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>

 --- a/net/batman-adv/multicast.c
 +++ b/net/batman-adv/multicast.c
-@@ -422,9 +422,14 @@ batadv_mcast_mla_softif_get_ipv6(struct
+@@ -431,9 +431,14 @@ batadv_mcast_mla_softif_get_ipv6(struct
 		return 0;
 	}
 
@ -22,7 +22,7 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 		if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) <
 		    IPV6_ADDR_SCOPE_LINKLOCAL)
 			continue;
-@@ -453,6 +458,9 @@ batadv_mcast_mla_softif_get_ipv6(struct
+@@ -462,6 +467,9 @@ batadv_mcast_mla_softif_get_ipv6(struct
 		hlist_add_head(&new->list, mcast_list);
 		ret++;
 	}
--- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-kstrtox.h-for-kstrtou64.patch
+++ b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-kstrtox.h-for-kstrtou64.patch
--- a/batman-adv/patches/0003-Revert-batman-adv-use-Linux-s-stdarg.h.patch
+++ b/batman-adv/patches/0003-Revert-batman-adv-use-Linux-s-stdarg.h.patch
--- a/batman-adv/patches/0004-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
+++ b/batman-adv/patches/0004-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
@ -0,0 +1,270 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 6 May 2022 22:03:29 +0200
+Subject: Revert "batman-adv: Migrate to linux/container_of.h"
+
+This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
+
+--- a/compat-include/linux/container_of.h
+++ /dev/null
+@@ -1,20 +0,0 @@
+-/* 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_CONTAINER_OF_H_
+-#define _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_
+-
+-#include <linux/version.h>
+-#if LINUX_VERSION_IS_GEQ(5, 16, 0)
+-#include_next <linux/container_of.h>
+-#else
+-#include <linux/kernel.h>
+-#endif
+-
+-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_ */
+--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
+@@ -13,13 +13,13 @@
+ #include <linux/bug.h>
+ #include <linux/byteorder/generic.h>
+ #include <linux/cache.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+ #include <linux/if_ether.h>
+ #include <linux/init.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
+@@ -10,13 +10,13 @@
+ #include <linux/atomic.h>
+ #include <linux/bitops.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/ethtool.h>
+ #include <linux/gfp.h>
+ #include <linux/if_ether.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/minmax.h>
+ #include <linux/netdevice.h>
+--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
+@@ -9,12 +9,12 @@
+ 
+ #include <linux/atomic.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+ #include <linux/if_ether.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
+@@ -10,7 +10,6 @@
+ #include <linux/atomic.h>
+ #include <linux/byteorder/generic.h>
+ #include <linux/compiler.h>
+-#include <linux/container_of.h>
+ #include <linux/crc16.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
+@@ -11,7 +11,6 @@
+ #include <linux/atomic.h>
+ #include <linux/bitops.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+@@ -21,6 +20,7 @@
+ #include <linux/in.h>
+ #include <linux/ip.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/netlink.h>
+--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
+@@ -9,7 +9,6 @@
+ 
+ #include <linux/atomic.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
+@@ -9,12 +9,12 @@
+ 
+ #include <linux/atomic.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/gfp.h>
+ #include <linux/if.h>
+ #include <linux/if_arp.h>
+ #include <linux/if_ether.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/limits.h>
+ #include <linux/list.h>
+--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
+@@ -9,7 +9,6 @@
+ #include <linux/atomic.h>
+ #include <linux/build_bug.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/crc32c.h>
+ #include <linux/device.h>
+ #include <linux/errno.h>
+--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
+@@ -11,7 +11,6 @@
+ #include <linux/bitops.h>
+ #include <linux/bug.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
+@@ -11,7 +11,6 @@
+ #include <linux/bitops.h>
+ #include <linux/byteorder/generic.h>
+ #include <linux/compiler.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+@@ -20,6 +19,7 @@
+ #include <linux/init.h>
+ #include <linux/jhash.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
+@@ -8,11 +8,11 @@
+ #include "main.h"
+ 
+ #include <linux/atomic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
+@@ -10,13 +10,13 @@
+ #include <linux/atomic.h>
+ #include <linux/bug.h>
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+ #include <linux/if.h>
+ #include <linux/if_ether.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/netdevice.h>
+--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
+@@ -11,7 +11,6 @@
+ #include <linux/byteorder/generic.h>
+ #include <linux/cache.h>
+ #include <linux/compiler.h>
+-#include <linux/container_of.h>
+ #include <linux/cpumask.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+@@ -20,6 +19,7 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_vlan.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
+@@ -12,13 +12,13 @@
+ #include <linux/byteorder/generic.h>
+ #include <linux/cache.h>
+ #include <linux/compiler.h>
+-#include <linux/container_of.h>
+ #include <linux/err.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+ #include <linux/if_ether.h>
+ #include <linux/init.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/kthread.h>
+ #include <linux/limits.h>
+--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
+@@ -13,7 +13,6 @@
+ #include <linux/byteorder/generic.h>
+ #include <linux/cache.h>
+ #include <linux/compiler.h>
+-#include <linux/container_of.h>
+ #include <linux/crc32c.h>
+ #include <linux/errno.h>
+ #include <linux/etherdevice.h>
+@@ -22,6 +21,7 @@
+ #include <linux/init.h>
+ #include <linux/jhash.h>
+ #include <linux/jiffies.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+--- a/net/batman-adv/tvlv.c
+++ b/net/batman-adv/tvlv.c
+@@ -7,10 +7,10 @@
+ #include "main.h"
+ 
+ #include <linux/byteorder/generic.h>
+-#include <linux/container_of.h>
+ #include <linux/etherdevice.h>
+ #include <linux/gfp.h>
+ #include <linux/if_ether.h>
+#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
--- a/batman-adv/patches/0006-batman-adv-make-mc_forwarding-atomic.patch
+++ b/batman-adv/patches/0006-batman-adv-make-mc_forwarding-atomic.patch
@ -1,27 +0,0 @@
-From: Eric Dumazet <edumazet@google.com>
-Date: Wed, 2 Mar 2022 20:05:13 +0100
-Subject: batman-adv: make mc_forwarding atomic
-
-This fixes minor data-races in ip6_mc_input() and
-batadv_mcast_mla_rtr_flags_softif_get_ipv6()
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-[sven@narfation.org: Add ugly hack to get it building with old kernels]
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/56db7c0540e733a1f063ccd6bab1b537a80857eb
-
--- a/net/batman-adv/multicast.c
-+++ b/net/batman-adv/multicast.c
-@@ -134,7 +134,11 @@ static u8 batadv_mcast_mla_rtr_flags_sof
- {
- 	struct inet6_dev *in6_dev = __in6_dev_get(dev);
- 
-+#if LINUX_VERSION_IS_GEQ(5, 18, 0) // UGLY_HACK_NEW
-+	if (in6_dev && atomic_read(&in6_dev->cnf.mc_forwarding))
-+#else // UGLY_HACK_OLD
- 	if (in6_dev && in6_dev->cnf.mc_forwarding)
-+#endif // UGLY_HACK_STOP
- 		return BATADV_NO_FLAGS;
- 	else
- 		return BATADV_MCAST_WANT_NO_RTR6;
--- a/batman-adv/patches/0007-batman-adv-compat-Add-atomic-mc_fowarding-support-fo.patch
+++ b/batman-adv/patches/0007-batman-adv-compat-Add-atomic-mc_fowarding-support-fo.patch
@ -1,23 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 15 Apr 2022 15:12:45 +0200
-Subject: batman-adv: compat: Add atomic mc_fowarding support for stable kernels
-
-Fixes: 56db7c0540e7 ("batman-adv: make mc_forwarding atomic")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/350adcaec82fbaa358a2406343b6130ac8dad126
-
--- a/net/batman-adv/multicast.c
-+++ b/net/batman-adv/multicast.c
-@@ -134,7 +134,11 @@ static u8 batadv_mcast_mla_rtr_flags_sof
- {
- 	struct inet6_dev *in6_dev = __in6_dev_get(dev);
- 
-#if LINUX_VERSION_IS_GEQ(5, 18, 0) // UGLY_HACK_NEW
-+#if (LINUX_VERSION_IS_GEQ(5, 4, 189) && LINUX_VERSION_IS_LESS(5, 5, 0)) || /* UGLY_HACK */ \
-+    (LINUX_VERSION_IS_GEQ(5, 10, 111) && LINUX_VERSION_IS_LESS(5, 11, 0)) || /* UGLY_HACK */ \
-+    (LINUX_VERSION_IS_GEQ(5, 15, 34) && LINUX_VERSION_IS_LESS(5, 16, 0)) || /* UGLY_HACK */ \
-+    (LINUX_VERSION_IS_GEQ(5, 16, 20) && LINUX_VERSION_IS_LESS(5, 17, 0)) || /* UGLY_HACK */ \
-+    LINUX_VERSION_IS_GEQ(5, 17, 3) // UGLY_HACK_NEW
- 	if (in6_dev && atomic_read(&in6_dev->cnf.mc_forwarding))
- #else // UGLY_HACK_OLD
- 	if (in6_dev && in6_dev->cnf.mc_forwarding)
--- a/batman-adv/patches/0001-Revert-batman-adv-genetlink-move-to-smaller-ops-wher.patch
+++ b/batman-adv/patches/0001-Revert-batman-adv-genetlink-move-to-smaller-ops-wher.patch
@ -14,115 +14,155 @@ This reverts commit 725b4ef5be840cfcd0ca33b9393c14dee40c10f7.

 --- a/compat-include/net/genetlink.h
 +++ b/compat-include/net/genetlink.h
-@@ -31,17 +31,15 @@ void batadv_genl_dump_check_consistent(s
+@@ -31,17 +31,28 @@ void batadv_genl_dump_check_consistent(s
 #endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */
 
 
-#if LINUX_VERSION_IS_LESS(5, 10, 0)
-
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #if LINUX_VERSION_IS_LESS(5, 10, 0)
+ 
+#endif
 #if LINUX_VERSION_IS_LESS(5, 2, 0)
+#if LINUX_VERSION_IS_LESS(5, 10, 0)
 +
+#endif
 enum genl_validate_flags {
 	GENL_DONT_VALIDATE_STRICT		= BIT(0),
 	GENL_DONT_VALIDATE_DUMP			= BIT(1),
 	GENL_DONT_VALIDATE_DUMP_STRICT		= BIT(2),
 };
-#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */
+#endif
 
-struct batadv_genl_small_ops {
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ struct batadv_genl_small_ops {
+#else
 +struct batadv_genl_ops {
+#endif
 	int		       (*doit)(struct sk_buff *skb,
 				       struct genl_info *info);
 	int		       (*dumpit)(struct sk_buff *skb,
-@@ -70,9 +68,9 @@ struct batadv_genl_family {
+@@ -70,9 +68,17 @@ struct batadv_genl_family {
 			 struct genl_info *info);
         void (*post_doit)(const struct genl_ops *ops, struct sk_buff *skb,
 			  struct genl_info *info);
-	const struct batadv_genl_small_ops *small_ops;
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ 	const struct batadv_genl_small_ops *small_ops;
+#else	
 +	const struct batadv_genl_ops *ops;
+#endif
 	const struct genl_multicast_group *mcgrps;
-	unsigned int n_small_ops;
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ 	unsigned int n_small_ops;
+#else
 +	unsigned int n_ops;
+#endif
 	unsigned int n_mcgrps;
 	struct module *module;
 
-@@ -96,32 +94,24 @@ static inline int batadv_genl_register_f
+@@ -96,32 +94,53 @@ static inline int batadv_genl_register_f
 	family->family.pre_doit = family->pre_doit;
 	family->family.post_doit = family->post_doit;
 	family->family.mcgrps = family->mcgrps;
-	family->family.n_ops = family->n_small_ops;
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ 	family->family.n_ops = family->n_small_ops;
+#else
 +	family->family.n_ops = family->n_ops;
+#endif
 	family->family.n_mcgrps = family->n_mcgrps;
 	family->family.module = family->module;
 
-	ops = kzalloc(sizeof(*ops) * family->n_small_ops, GFP_KERNEL);
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ 	ops = kzalloc(sizeof(*ops) * family->n_small_ops, GFP_KERNEL);
+#else
 +	ops = kzalloc(sizeof(*ops) * family->n_ops, GFP_KERNEL);
+#endif
 	if (!ops)
 		return -ENOMEM;
 
 	for (i = 0; i < family->family.n_ops; i++) {
-		ops[i].doit = family->small_ops[i].doit;
-		ops[i].dumpit = family->small_ops[i].dumpit;
-		ops[i].done = family->small_ops[i].done;
-		ops[i].cmd = family->small_ops[i].cmd;
-		ops[i].internal_flags = family->small_ops[i].internal_flags;
-		ops[i].flags = family->small_ops[i].flags;
-#if LINUX_VERSION_IS_GEQ(5, 2, 0)
-		ops[i].validate = family->small_ops[i].validate;
-#else
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ 		ops[i].doit = family->small_ops[i].doit;
+ 		ops[i].dumpit = family->small_ops[i].dumpit;
+ 		ops[i].done = family->small_ops[i].done;
+ 		ops[i].cmd = family->small_ops[i].cmd;
+ 		ops[i].internal_flags = family->small_ops[i].internal_flags;
+ 		ops[i].flags = family->small_ops[i].flags;
+ #if LINUX_VERSION_IS_GEQ(5, 2, 0)
+ 		ops[i].validate = family->small_ops[i].validate;
+ #else
+#else
 +		ops[i].doit = family->ops[i].doit;
 +		ops[i].dumpit = family->ops[i].dumpit;
 +		ops[i].done = family->ops[i].done;
 +		ops[i].cmd = family->ops[i].cmd;
 +		ops[i].internal_flags = family->ops[i].internal_flags;
 +		ops[i].flags = family->ops[i].flags;
+#endif
 		ops[i].policy = family->policy;
-#endif
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #endif
+#endif
 	}
 
-#if LINUX_VERSION_IS_GEQ(5, 2, 0)
-	family->family.policy = family->policy;
-#endif
-
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #if LINUX_VERSION_IS_GEQ(5, 2, 0)
+ 	family->family.policy = family->policy;
+ #endif
+ 
+#endif
 	family->family.ops = ops;
 	family->copy_ops = ops;
 
-@@ -136,7 +126,7 @@ typedef struct genl_ops batadv_genl_ops_
+@@ -136,7 +126,11 @@ typedef struct genl_ops batadv_genl_ops_
 #define batadv_post_doit(__x, __y, __z) \
 	batadv_post_doit(const batadv_genl_ops_old *ops, __y, __z)
 
-#define genl_small_ops batadv_genl_small_ops
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #define genl_small_ops batadv_genl_small_ops
+#else
 +#define genl_ops batadv_genl_ops
+#endif
 #define genl_family batadv_genl_family
 
 #define genl_register_family(family) \
-@@ -160,6 +150,6 @@ batadv_genl_unregister_family(struct bat
+@@ -160,6 +150,10 @@ batadv_genl_unregister_family(struct bat
 	genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \
 				_group, _flags)
 
-#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */
+#else
 +#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */
+#endif
 
 #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */
 --- a/net/batman-adv/netlink.c
 +++ b/net/batman-adv/netlink.c
-@@ -1357,7 +1357,7 @@ static void batadv_post_doit(const struc
+@@ -1357,7 +1357,11 @@ static void batadv_post_doit(const struc
 	}
 }
 
-static const struct genl_small_ops batadv_netlink_ops[] = {
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ static const struct genl_small_ops batadv_netlink_ops[] = {
+#else
 +static const struct genl_ops batadv_netlink_ops[] = {
+#endif
 	{
 		.cmd = BATADV_CMD_GET_MESH,
 		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-@@ -1491,8 +1491,8 @@ struct genl_family batadv_netlink_family
+@@ -1491,8 +1491,13 @@ struct genl_family batadv_netlink_family
 	.pre_doit = batadv_pre_doit,
 	.post_doit = batadv_post_doit,
 	.module = THIS_MODULE,
-	.small_ops = batadv_netlink_ops,
-	.n_small_ops = ARRAY_SIZE(batadv_netlink_ops),
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ 	.small_ops = batadv_netlink_ops,
+ 	.n_small_ops = ARRAY_SIZE(batadv_netlink_ops),
+#else
 +	.ops = batadv_netlink_ops,
 +	.n_ops = ARRAY_SIZE(batadv_netlink_ops),
- 	.mcgrps = batadv_netlink_mcgrps,
- 	.n_mcgrps = ARRAY_SIZE(batadv_netlink_mcgrps),
- };
+#endif
+ #if LINUX_VERSION_IS_GEQ(6, 1, 0) // UGLY_HACK_NEW
+ 	.resv_start_op = BATADV_CMD_SET_VLAN + 1,
+ #endif // UGLY_HACK_STOP
--- a/batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch
+++ b/batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch
@ -9,108 +9,103 @@ This reverts commit 1810de05310d5c5e9140f870ac21052f38bc06b8.

 Signed-off-by: Sven Eckelmann <sven@narfation.org>

--- a/compat-include/linux/minmax.h
-+++ /dev/null
-@@ -1,20 +0,0 @@
-/* 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_MINMAX_H_
-#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
-
-#include <linux/version.h>
-#if LINUX_VERSION_IS_GEQ(5, 10, 0)
-#include_next <linux/minmax.h>
-#else
-#include <linux/kernel.h>
-#endif
-
-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */
 --- a/net/batman-adv/bat_v.c
 +++ b/net/batman-adv/bat_v.c
-@@ -15,7 +15,6 @@
+@@ -15,7 +15,9 @@
 #include <linux/jiffies.h>
 #include <linux/kref.h>
 #include <linux/list.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
 #include <linux/rculist.h>
 --- a/net/batman-adv/bat_v_elp.c
 +++ b/net/batman-adv/bat_v_elp.c
-@@ -18,7 +18,6 @@
+@@ -18,7 +18,9 @@
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/nl80211.h>
 #include <linux/prandom.h>
 --- a/net/batman-adv/bat_v_ogm.c
 +++ b/net/batman-adv/bat_v_ogm.c
-@@ -18,7 +18,6 @@
+@@ -18,7 +18,9 @@
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/lockdep.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/prandom.h>
 --- a/net/batman-adv/fragmentation.c
 +++ b/net/batman-adv/fragmentation.c
-@@ -14,8 +14,8 @@
+@@ -14,8 +14,13 @@
 #include <linux/gfp.h>
 #include <linux/if_ether.h>
 #include <linux/jiffies.h>
+#if LINUX_VERSION_IS_LESS(5, 10, 0)
 +#include <linux/kernel.h>
+#endif
 #include <linux/lockdep.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 --- a/net/batman-adv/hard-interface.c
 +++ b/net/batman-adv/hard-interface.c
-@@ -17,7 +17,6 @@
+@@ -17,7 +17,9 @@
 #include <linux/kref.h>
 #include <linux/limits.h>
 #include <linux/list.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
 --- a/net/batman-adv/main.c
 +++ b/net/batman-adv/main.c
-@@ -23,7 +23,6 @@
+@@ -23,7 +23,9 @@
 #include <linux/kobject.h>
 #include <linux/kref.h>
 #include <linux/list.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
 --- a/net/batman-adv/netlink.c
 +++ b/net/batman-adv/netlink.c
-@@ -23,7 +23,6 @@
+@@ -23,7 +23,9 @@
 #include <linux/kernel.h>
 #include <linux/limits.h>
 #include <linux/list.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
 #include <linux/printk.h>
 --- a/net/batman-adv/tp_meter.c
 +++ b/net/batman-adv/tp_meter.c
-@@ -23,7 +23,6 @@
+@@ -23,7 +23,9 @@
 #include <linux/kthread.h>
 #include <linux/limits.h>
 #include <linux/list.h>
-#include <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+ #include <linux/minmax.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/param.h>
 #include <linux/printk.h>
--- a/batman-adv/src/compat-hacks.h
+++ b/batman-adv/src/compat-hacks.h
@ -103,6 +103,29 @@ static inline void batadv_eth_hw_addr_set(struct net_device *dev,

 #endif /* LINUX_VERSION_IS_LESS(5, 15, 0) */

+#if LINUX_VERSION_IS_LESS(5, 18, 0)
+
+#include <linux/netdevice.h>
+
+static inline int batadv_netif_rx(struct sk_buff *skb)
+{
+	if (in_interrupt())
+		return netif_rx(skb);
+	else
+		return netif_rx_ni(skb);
+}
+#define netif_rx batadv_netif_rx
+
+#endif /* LINUX_VERSION_IS_LESS(5, 18, 0) */
+
+#if LINUX_VERSION_IS_LESS(6, 0, 0)
+
+#define __vstring(item, fmt, ap) __dynamic_array(char, item, 256)
+#define __assign_vstr(dst, fmt, va) \
+	WARN_ON_ONCE(vsnprintf(__get_dynamic_array(dst), 256, fmt, *va) >= 256)
+
+#endif /* LINUX_VERSION_IS_LESS(6, 0, 0) */
+
 /* <DECLARE_EWMA> */

 #include <linux/version.h>