From patchwork Thu Nov 8 23:18:02 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: 995239 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="AtpNDFNq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42rfNJ4s0cz9s9G for ; Fri, 9 Nov 2018 10:18:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727485AbeKII4N (ORCPT ); Fri, 9 Nov 2018 03:56:13 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:65346 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726915AbeKIIzy (ORCPT ); Fri, 9 Nov 2018 03:55:54 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42rfLm1Zl1zTQ; Fri, 9 Nov 2018 00:17:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541719024; bh=+SK+n9+g9d3vOxlKaffebdt4fu9Zy2ht+kS1MahY5MI=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=AtpNDFNqf5ASYuFCuT7TrQyWDpOSVZZRmBXI/PeUZx/G6iHs4T+bqc9VQ/pLHz8nQ v00MpAGT+Iy2I8rTN4C4+pA4SreR+yn/Y2/4twoiZiMPq4OvO5Pj+kea5Rjk5fT+jR +KlYyydZ8Qx4/dXJXscZyjKweFHUCDZYYZLItXXDi3pnS9QLumj5nxR/FvE+/3j9vz wq6cmD+lWTKS2V6jSJda8qgV1evAFM0wPtaQTLVXHAhl/6YmcMLqLfYV4YDx5hgtMB IE7/52i6IYujDrE0yKePhbASSNdTvWLRxHtIzNjNnBlqBZ3HlbbCU/L6z2dxLTlQaf eysv8Xv55VaDQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Fri, 09 Nov 2018 00:18:02 +0100 Message-Id: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 2/9] nfnetlink/queue: use __vlan_hwaccel helpers MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Ajit Khaparde , Alexey Kuznetsov , bridge@lists.linux-foundation.org, Cong Wang , "David S. Miller" , Hideaki YOSHIFUJI , Jamal Hadi Salim , Jiri Pirko , linux-rdma@vger.kernel.org, Mirko Lindner , Nikolay Aleksandrov , 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/netfilter/nfnetlink_queue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 43041f087eb3..1ce30efe6854 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1148,8 +1148,9 @@ static int nfqa_parse_bridge(struct nf_queue_entry *entry, if (!tb[NFQA_VLAN_TCI] || !tb[NFQA_VLAN_PROTO]) return -EINVAL; - entry->skb->vlan_tci = ntohs(nla_get_be16(tb[NFQA_VLAN_TCI])); - entry->skb->vlan_proto = nla_get_be16(tb[NFQA_VLAN_PROTO]); + __vlan_hwaccel_put_tag(entry->skb, + nla_get_be16(tb[NFQA_VLAN_PROTO]), + ntohs(nla_get_be16(tb[NFQA_VLAN_TCI]))); } if (nfqa[NFQA_L2HDR]) {