Message ID | 51FAF636.1090802@gmail.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Wang Sheng-Hui <shhuiw@gmail.com> Date: Fri, 02 Aug 2013 07:58:46 +0800 > 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 make a fresh patch posting, don't use a reply to this thread. Thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;