From patchwork Thu Nov 8 23:18:03 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: 995238 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="Ve3N14x6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42rfNF22fvz9s9G for ; Fri, 9 Nov 2018 10:18:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727326AbeKIIz5 (ORCPT ); Fri, 9 Nov 2018 03:55:57 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:65480 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727086AbeKIIz4 (ORCPT ); Fri, 9 Nov 2018 03:55:56 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42rfLn25N4zdc; Fri, 9 Nov 2018 00:17:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541719025; bh=Qc7PnMXGc8+FfHDHzLrLqc5PfyMzVK3ZXR888xiFvgE=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=Ve3N14x6Efv9F25iyjVT9uL761sMUveOcEy78JWbvd5aj25YROZY4GZEhqdimE9Px alVoUhxxY750SWqL1lFOH6t0ekzo9Ls+WrccudsZ79q8Ib2TbuIOanEE0e2R0tJR8x nhtyTYlB0f0xKMrwqjsjCiSYvCKREqFUPNJMHVWbcw2x8SEqOxdkT3IWPeIqJ63gss Qz+W9irOny4daCBrdBuJkYrfBvaY9f37juKQyDRugly7gs4vx/gkd0pDIC+DBIiL9D hMICZRcdp+m0DCFPVpUntMzjGflA8BTQf3TQATxq4i5jnakVRcZTRa/bqWpPCilPeQ Mi2fC5u8gkaXg== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Fri, 09 Nov 2018 00:18:03 +0100 Message-Id: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 4/9] 8021q: use __vlan_hwaccel helpers MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: "David S. Miller" , Ajit Khaparde , Alexey Kuznetsov , bridge@lists.linux-foundation.org, Cong Wang , coreteam@netfilter.org, Florian Westphal , Hideaki YOSHIFUJI , 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/8021q/vlan_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 4f60e86f4b8d..dd39489c829a 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -57,7 +57,7 @@ bool vlan_do_receive(struct sk_buff **skbp) } skb->priority = vlan_get_ingress_priority(vlan_dev, skb->vlan_tci); - skb->vlan_tci = 0; + __vlan_hwaccel_clear_tag(skb); rx_stats = this_cpu_ptr(vlan_dev_priv(vlan_dev)->vlan_pcpu_stats);