From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Wed, 7 Nov 2018 17:07:02 +0000 (+0100)
Subject: net/vlan: introduce __vlan_hwaccel_clear_tag() helper
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c8accd5a0a6abfc0405a331afa5bfc06ee92623a;p=linux.git

net/vlan: introduce __vlan_hwaccel_clear_tag() helper

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 83ea4df6ab816..c438fa0a1c6ae 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -461,6 +461,17 @@ static inline struct sk_buff *vlan_insert_tag_set_proto(struct sk_buff *skb,
 	return skb;
 }
 
+/**
+ * __vlan_hwaccel_clear_tag - clear hardware accelerated VLAN info
+ * @skb: skbuff to clear
+ *
+ * Clears the VLAN information from @skb
+ */
+static inline void __vlan_hwaccel_clear_tag(struct sk_buff *skb)
+{
+	skb->vlan_tci = 0;
+}
+
 /*
  * __vlan_hwaccel_push_inside - pushes vlan tag to the payload
  * @skb: skbuff to tag
@@ -475,7 +486,7 @@ static inline struct sk_buff *__vlan_hwaccel_push_inside(struct sk_buff *skb)
 	skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
 					skb_vlan_tag_get(skb));
 	if (likely(skb))
-		skb->vlan_tci = 0;
+		__vlan_hwaccel_clear_tag(skb);
 	return skb;
 }