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 <s...@narfation.org>
---
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()
---
base-commit: f33d7f724675544a36b24c77f8d4b95d41252ae2
change-id: 20231223-compat-skb_vlan_eth_hdr-deabef2d774c
Best regards,
--
Sven Eckelmann <s...@narfation.org>
