From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Thu, 8 Nov 2018 23:18:04 +0000 (+0100)
Subject: ipv4/tunnel: use __vlan_hwaccel helpers
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e2ed0c2575091254760f1dc9b0ddeb999aca716;p=linux.git

ipv4/tunnel: use __vlan_hwaccel helpers

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

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index dde671e978298..f45b96d715f07 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -120,7 +120,7 @@ int __iptunnel_pull_header(struct sk_buff *skb, int hdr_len,
 	}
 
 	skb_clear_hash_if_not_l4(skb);
-	skb->vlan_tci = 0;
+	__vlan_hwaccel_clear_tag(skb);
 	skb_set_queue_mapping(skb, 0);
 	skb_scrub_packet(skb, xnet);