Skip to contentSkip to conversation

vlan: cleanup the usage of *vlan in vlan_dev_hard_header

PATCH In review Wang Sheng-Hui 2 participants 4 messages Aug 1, 2013 – Aug 2, 2013

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Wang Sheng-Hui

author
#0 lore raw

PATCH 1/1 vlan: cleanup the usage of *vlan in vlan_dev_hard_header

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 <[email protected]>
---
 net/8021q/vlan_dev.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
net/8021q/vlan_dev.c +3 -3
index 1cd3d2a..9ab8a7e 100644
@@ -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;
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw

From: Wang Sheng-Hui <[email protected]>
Date: Thu, 01 Aug 2013 14:10:23 +0800

Quoted 5 lines

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 <[email protected]>

This patch was corrupted by your email client.

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.

author
#2 lore raw
Quoted 11 lines · David Miller

From: Wang Sheng-Hui <[email protected]>
Date: Thu, 01 Aug 2013 14:10:23 +0800

Quoted 5 lines

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 <[email protected]>

This patch was corrupted by your email client.

Sorry. Please recheck the patch below.

Quoted 6 lines

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 <[email protected]>
---
 net/8021q/vlan_dev.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
net/8021q/vlan_dev.c +3 -3
index 1cd3d2a..9ab8a7e 100644
@@ -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;
Signature · 1 line
1.7.10.4
maintainer
#3 lore raw

From: Wang Sheng-Hui <[email protected]>
Date: Fri, 02 Aug 2013 07:58:46 +0800

Quoted 8 lines · David Miller
Quoted 7 lines

From: Wang Sheng-Hui <[email protected]>
Date: Thu, 01 Aug 2013 14:10:23 +0800

Quoted 4 lines

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.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Wang Sheng-Hui <[email protected]>

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.