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: 994378 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="gaTUHDKH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qtBM2DF6z9sCw for ; Thu, 8 Nov 2018 04:07:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731408AbeKHCiT (ORCPT ); Wed, 7 Nov 2018 21:38:19 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:2650 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727941AbeKHCiT (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 42qt99749mzBr; 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=1541610366; bh=PpuoG6QF2xxA93CCIhr/0ng4UhdkMiHnLIsePOg74G4=; h=Date:In-Reply-To:References:From:Subject:To:From; b=gaTUHDKHUMx7YwWhEp6+d/BKWHHhWezTyhxb5Znoe8EvsgVsqiPm8T7ncxRabVjzG pFRecDEfASuY6HZTcdnyDDZJGRi0okOKykJwb1C6wmh3TlYub+SMdc06dKdn3C8jne GbvXrs5CPt2EDXhaE8kxBVhmW3C3DjVkAu6aHxHsI6Cs3VD7ELLZSug1Pu5Pel1TnU c5im7XuZOZ+w48UwA5V0tHp5fMLoeyDcIXR+W4Ykvj+hI9ShYtxko2NAS/APiL+qV1 MwU7Ktdez/X43xYKWXsqZguiC4TNFhnmDo/PMLw5z7a3MHRIj8zvJfyUKtzOmhZRe6 51OZ19IF4OvBw== 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: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 2/4] net/vlan: introduce __vlan_hwaccel_copy_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, 13 insertions(+) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index c438fa0a1c6a..941da4bf3929 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -472,6 +472,19 @@ static inline void __vlan_hwaccel_clear_tag(struct sk_buff *skb) skb->vlan_tci = 0; } +/** + * __vlan_hwaccel_copy_tag - copy hardware accelerated VLAN info from another skb + * @dst: skbuff to copy to + * @src: skbuff to copy from + * + * Copies VLAN information from @src to @dst (for branchless code) + */ +static inline void __vlan_hwaccel_copy_tag(struct sk_buff *dst, const struct sk_buff *src) +{ + dst->vlan_proto = src->vlan_proto; + dst->vlan_tci = src->vlan_tci; +} + /* * __vlan_hwaccel_push_inside - pushes vlan tag to the payload * @skb: skbuff to tag