From: Serhey Popovych <serhe.popovych@gmail.com>
Date: Fri, 29 Nov 2019 09:21:31 +0000 (+0200)
Subject: compat: Use skb_vlan_tag_present() instead of vlan_tx_tag_present()
X-Git-Tag: v7.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eda9fd68157c444f70541bd10fde3c36e09f0f1;p=thirdparty%2Fipset.git

compat: Use skb_vlan_tag_present() instead of vlan_tx_tag_present()

Since RHEL6 provides it as preprocessor define and does not provide
vlan_tx_tag_present(). Add defines in case of vlan_tx_tag_present()
isn't available to back tc_skb_protocol() to old behaviour before
commit d8b9605d2697 ("net: sched: fix skb->protocol use in case
of accelerated vlan path").

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
---

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 38f4179a..92d815e1 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -335,9 +335,20 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype,
 
 #ifndef HAVE_TC_SKB_PROTOCOL
 #include <linux/if_vlan.h>
+
+/* RHEL defines it */
+#ifndef skb_vlan_tag_present
+#if !defined(vlan_tx_tag_present) && \
+    !defined(NETIF_F_HW_VLAN_TX) && \
+    !defined(NETIF_F_HW_VLAN_CTAG_TX)
+#define vlan_tx_tag_present(skb) 0
+#endif
+#define skb_vlan_tag_present vlan_tx_tag_present
+#endif
+
 static inline __be16 tc_skb_protocol(const struct sk_buff *skb)
 {
-	if (vlan_tx_tag_present(skb))
+	if (skb_vlan_tag_present(skb))
 #ifdef HAVE_VLAN_PROTO_IN_SK_BUFF
 		return skb->vlan_proto;
 #else