From patchwork Tue Dec 13 00:12:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 705260 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3td0YN52JTz9t10 for ; Tue, 13 Dec 2016 11:13:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932713AbcLMANf (ORCPT ); Mon, 12 Dec 2016 19:13:35 -0500 Received: from rere.qmqm.pl ([84.10.57.10]:50212 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932529AbcLMAMk (ORCPT ); Mon, 12 Dec 2016 19:12:40 -0500 Received: by rere.qmqm.pl (Postfix, from userid 1000) id 9C9AF611A; Tue, 13 Dec 2016 01:12:38 +0100 (CET) Message-Id: <6426e1ea2c06e834e07ddd1867c18c65fd623566.1481586602.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH net-next 15/27] ipv4/tunnel: use __vlan_hwaccel helpers MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: "David S. Miller" (maintainer:NETWORKING [IPv4/IPv6]), Alexey Kuznetsov (maintainer:NETWORKING [IPv4/IPv6]), James Morris (maintainer:NETWORKING [IPv4/IPv6]), Hideaki YOSHIFUJI (maintainer:NETWORKING [IPv4/IPv6]), Patrick McHardy (maintainer:NETWORKING [IPv4/IPv6]) Date: Tue, 13 Dec 2016 01:12:38 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Michał Mirosław --- net/ipv4/ip_tunnel_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index fed3d29..0004a54 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);