From patchwork Wed Nov 7 17:07: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: 994379 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="aL+RHaSp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qtBN0TlHz9s7h for ; Thu, 8 Nov 2018 04:07:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387520AbeKHCiT (ORCPT ); Wed, 7 Nov 2018 21:38:19 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:30294 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727848AbeKHCiT (ORCPT ); Wed, 7 Nov 2018 21:38:19 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42qt994jfcz9F; Wed, 7 Nov 2018 18:06:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541610365; bh=B+h8ifh3HLK1JLlmbyw5V1a1DLdQhJQEqhyY0PvFPSQ=; h=Date:In-Reply-To:References:From:Subject:To:From; b=aL+RHaSpGNkf/xYUzf1KIE1YDjsVY6qLm5wvzLXfYYE0rTYPqIpjBbh6SCCSrcKBi yAAqZhlFCC9lgTARKH4Hwz2euon5cCTvcAYFmyOTi5YFCQp2RQ7faZnx0bVJTAEwyg QyE2MOcHJydAW3h9jHrvHGRt7OUvlLYy2X88w8BqJ0Uw9b5c9QUQHtsbiB29nSL4lx CzjzumoRHzW8gOpqV/nQD4dKNr7EEfCnjPrxwWvpQe5sRYMzHt3W17r2bz9UWFMQEk UhWLHkOMzFwgI/3dptndGum1e55BuEiYtUFYbOxaHYxbOPV4zTwzVOATqivNAZJgUG AgTujILgWHBpQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Wed, 07 Nov 2018 18:07:02 +0100 Message-Id: <743b58a62c8d9b01b3463aba724bc33095b7baca.1541610138.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 1/4] net/vlan: introduce __vlan_hwaccel_clear_tag() helper MIME-Version: 1.0 To: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Michał Mirosław --- include/linux/if_vlan.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 83ea4df6ab81..c438fa0a1c6a 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -461,6 +461,17 @@ static inline struct sk_buff *vlan_insert_tag_set_proto(struct sk_buff *skb, return skb; } +/** + * __vlan_hwaccel_clear_tag - clear hardware accelerated VLAN info + * @skb: skbuff to clear + * + * Clears the VLAN information from @skb + */ +static inline void __vlan_hwaccel_clear_tag(struct sk_buff *skb) +{ + skb->vlan_tci = 0; +} + /* * __vlan_hwaccel_push_inside - pushes vlan tag to the payload * @skb: skbuff to tag @@ -475,7 +486,7 @@ static inline struct sk_buff *__vlan_hwaccel_push_inside(struct sk_buff *skb) skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto, skb_vlan_tag_get(skb)); if (likely(skb)) - skb->vlan_tci = 0; + __vlan_hwaccel_clear_tag(skb); return skb; }