From patchwork Thu Nov 8 23:18:04 2018 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: 995240 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="UkhaiBA+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42rfNM1wmzz9sDJ for ; Fri, 9 Nov 2018 10:18:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727454AbeKII4N (ORCPT ); Fri, 9 Nov 2018 03:56:13 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:41408 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727045AbeKIIz5 (ORCPT ); Fri, 9 Nov 2018 03:55:57 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42rfLp0QMfzrd; Fri, 9 Nov 2018 00:17:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541719026; bh=rQIk5+P6EcKbWCWWr4OJqJ7q7H1OwU7fRELwhVstikA=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=UkhaiBA+o23XBWOGgOTA8QeUNAg1nhSaXia4a1Aa1JCOtzTNvWYWQ6f0cidWjXFVK SVgkbZXmTIOziWVUQyhCiA3x1r94dKWyEdYCIgXq8zZqAF/zV8sz8I6uSkJYvx3+cM gSLHfb1Akc6FbUTBAaDU0XZYUcdKRbaXOKAEA5IOw+2F85dBaSwW0M+cBNiUP3CG7f IDoms3XqjeW9Sp4GfHQ5s/yrFgLgtwe+2MtoVIKVApjZ4rKtI8wc64oCu9CAicl5GH pPPWRdiT5OASVIn0o3pBG3S6EoSDSlh1oYUwUi46GoE3PryGSpEwL48ufzMLX7/vwp TIQ4tA/W9vvgA== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Fri, 09 Nov 2018 00:18:04 +0100 Message-Id: <53209e7c5fd949ac69087902ad42b1831eec0727.1541718583.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 6/9] ipv4/tunnel: use __vlan_hwaccel helpers MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Ajit Khaparde , bridge@lists.linux-foundation.org, Cong Wang , coreteam@netfilter.org, Florian Westphal , Jamal Hadi Salim , Jiri Pirko , Jozsef Kadlecsik , linux-rdma@vger.kernel.org, Mirko Lindner , netfilter-devel@vger.kernel.org, Nikolay Aleksandrov , Pablo Neira Ayuso , Roopa Prabhu , Sathya Perla , Somnath Kotur , Sriharsha Basavapatna , Stephen Hemminger , Steve Wise , Tariq Toukan 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 dde671e97829..f45b96d715f0 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);