Re: [PATCH] vlan: cleanup the usage of *vlan in vlan_dev_hard_header

[Wang Sheng-Hui <shhuiw@gmail.com>]

On 2013年08月02日 04:12, David Miller wrote:
> From: Wang Sheng-Hui <shhuiw@gmail.com>
> 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 <shhuiw@gmail.com>
>
> 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 <shhuiw@gmail.com>
---
  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;
-- 
1.7.10.4