From patchwork Thu Aug 1 23:58:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wang Sheng-Hui X-Patchwork-Id: 264171 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2EAAF2C0091 for ; Fri, 2 Aug 2013 09:59:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757492Ab3HAX65 (ORCPT ); Thu, 1 Aug 2013 19:58:57 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:62878 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756181Ab3HAX64 (ORCPT ); Thu, 1 Aug 2013 19:58:56 -0400 Received: by mail-pd0-f169.google.com with SMTP id y11so13409pdj.14 for ; Thu, 01 Aug 2013 16:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=mYrlvG49wxaryreWvt3L9mvkvwqK32P+CVG+v8TAdDU=; b=sgv6u4SVR1WqLPzBTF1uaXdYbkfK0VM6F9+qLzmhXsOgHjOZD6Ovpa2QgZHg+CjjEx 6WWFz2H2AhR+mZs6W177V2RfqDeXLG0yhD6GCROHPkBZNaK1kNz2/qFU5ra6D1BIJ8QP GlEavUXLosWyi8og1Aw80pu8DlEu/epxk1XSAelsPKza1ixRo/SjY8enxPIDtmySkQFA LGzmz6jsTPxUwrNEnwy8YY6G2p4sp+8I2VUHlDBDzo714kTDoMG5mEuK6XagPUb3Plo5 gBfZaFrEbrZhGfQueCqF4RjDyAxC134JBnMPX2Hx0UV6pF0t9Js6koBtWCpKDDbEco9g OZ1w== X-Received: by 10.66.169.42 with SMTP id ab10mr7414295pac.14.1375401535693; Thu, 01 Aug 2013 16:58:55 -0700 (PDT) Received: from [9.115.120.125] ([202.108.130.138]) by mx.google.com with ESMTPSA id fa5sm3855500pbb.3.2013.08.01.16.58.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Aug 2013 16:58:55 -0700 (PDT) Message-ID: <51FAF636.1090802@gmail.com> Date: Fri, 02 Aug 2013 07:58:46 +0800 From: Wang Sheng-Hui User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: David Miller CC: kaber@trash.net, netdev@vger.kernel.org Subject: Re: [PATCH] vlan: cleanup the usage of *vlan in vlan_dev_hard_header References: <51F9FBCF.9060405@gmail.com> <20130801.131230.25199405118866430.davem@davemloft.net> In-Reply-To: <20130801.131230.25199405118866430.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 2013年08月02日 04:12, David Miller wrote: > From: Wang Sheng-Hui > Date: Thu, 01 Aug 2013 14:10:23 +0800 > >> We can use vlan directly after we get the pointer at the beginning >> *vlan = vlan_dev_priv(dev) >> and do not use vlan_dev_priv(dev) to access its fields afterwards. >> >> Signed-off-by: Wang Sheng-Hui > > This patch was corrupted by your email client. > Sorry. Please recheck the patch below. > Please read Documentation/email-clients.txt to learn how to > fix this, send a test patch to yourself, and only when you > can successfully apply the patch you receive in that test email > should you repost your patch again here. > > Thanks. We can use vlan directly after we get the pointer at the beginning *vlan = vlan_dev_priv(dev) and do not use vlan_dev_priv(dev) to access its fields afterwords. Signed-off-by: Wang Sheng-Hui --- net/8021q/vlan_dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 1cd3d2a..9ab8a7e 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -107,10 +107,10 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, u16 vlan_tci = 0; int rc; - if (!(vlan_dev_priv(dev)->flags & VLAN_FLAG_REORDER_HDR)) { + if (!(vlan->flags & VLAN_FLAG_REORDER_HDR)) { vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN); - vlan_tci = vlan_dev_priv(dev)->vlan_id; + vlan_tci = vlan->vlan_id; vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb); vhdr->h_vlan_TCI = htons(vlan_tci); @@ -133,7 +133,7 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, saddr = dev->dev_addr; /* Now make the underlying real hard header */ - dev = vlan_dev_priv(dev)->real_dev; + dev = vlan->real_dev; rc = dev_hard_header(skb, dev, type, daddr, saddr, len + vhdrlen); if (rc > 0) rc += vhdrlen;