From c965c9770b0a8c49375fdf47c544bc2bb3c3bce6 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@netfilter.org>
Date: Thu, 19 Nov 2020 13:50:02 +0100
Subject: Compatibility: use skb_policy() from if_vlan.h if available

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
---
 configure.ac                                            | 10 ++++++++++
 kernel/include/linux/netfilter/ipset/ip_set_compat.h.in |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/configure.ac b/configure.ac
index 7388cdd..dcb533d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -756,6 +756,16 @@ else
 	AC_SUBST(HAVE_LIST_FOR_EACH_ENTRY_RCU_FOUR_ARGS, undef)
 fi
 
+AC_MSG_CHECKING([kernel source for skb_protocol() in if_vlan.h])
+if test -f $ksourcedir/include/linux/if_vlan.h && \
+   $GREP -q 'static inline __be16 skb_protocol' $ksourcedir/include/linux/if_vlan.h; then
+	AC_MSG_RESULT(yes)
+	AC_SUBST(HAVE_SKB_PROTOCOL, define)
+else
+	AC_MSG_RESULT(no)
+	AC_SUBST(HAVE_SKB_PROTOCOL, undef)
+fi
+
 AC_MSG_CHECKING([kernel source for struct net_generic])
 if test -f $ksourcedir/include/net/netns/generic.h && \
    $GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
index 0bcff2c..cc61baf 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -57,6 +57,7 @@
 #@HAVE_COND_RESCHED_RCU@ HAVE_COND_RESCHED_RCU
 #@HAVE_SKB_IIF@ HAVE_SKB_IIF
 #@HAVE_LIST_FOR_EACH_ENTRY_RCU_FOUR_ARGS@ HAVE_LIST_FOR_EACH_ENTRY_RCU_FOUR_ARGS
+#@HAVE_SKB_PROTOCOL@ HAVE_SKB_PROTOCOL
 
 #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H
 #include <linux/module.h>
@@ -372,6 +373,9 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype,
 
 static inline __be16 tc_skb_protocol(const struct sk_buff *skb)
 {
+#ifdef HAVE_SKB_PROTOCOL
+	return skb_protocol(skb, true);
+#else
 	if (skb_vlan_tag_present(skb))
 #ifdef HAVE_VLAN_PROTO_IN_SK_BUFF
 		return skb->vlan_proto;
@@ -379,6 +383,7 @@ static inline __be16 tc_skb_protocol(const struct sk_buff *skb)
 		return htons(ETH_P_8021Q);
 #endif
 	return skb->protocol;
+#endif
 }
 #endif
 
-- 
cgit v1.2.3