Repository : ssh://git@diktynna/batman-adv
On branches: main,stable,main,stable
>---------------------------------------------------------------
commit be69e50e8c249ced085d41ddd308016c1c692174
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat Dec 23 12:31:36 2023 +0100
batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels
The newest Linux stable kernel releases:
* v5.10.205
* v5.15.144
* v6.1.69
received a backported version of commit 1f5020acb33f ("net: vlan: introduce
skb_vlan_eth_hdr()"). batman-adv must therefore not provide this function
any longer for these kernel versions.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
be69e50e8c249ced085d41ddd308016c1c692174
compat-include/linux/if_vlan.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h
index eb15e060..f19674b5 100644
--- a/compat-include/linux/if_vlan.h
+++ b/compat-include/linux/if_vlan.h
@@ -13,7 +13,10 @@
#include <linux/version.h>
#include_next <linux/if_vlan.h>
-#if LINUX_VERSION_IS_LESS(6, 4, 0)
+#if LINUX_VERSION_IS_LESS(6, 4, 0) && \
+ !(LINUX_VERSION_IS_GEQ(5, 10, 205) && LINUX_VERSION_IS_LESS(5, 11, 0)) && \
+ !(LINUX_VERSION_IS_GEQ(5, 15, 144) && LINUX_VERSION_IS_LESS(5, 16, 0)) && \
+ !(LINUX_VERSION_IS_GEQ(6, 1, 69) && LINUX_VERSION_IS_LESS(6, 2, 0))
/* Prefer this version in TX path, instead of
* skb_reset_mac_header() + vlan_eth_hdr()