Skip to contentSkip to conversation

vlan: Use __vlan_hwaccel_put_tag() in rx

PATCH Applied Eric Dumazet 2 participants 2 messages Nov 13, 2009 – Nov 16, 2009

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

Eric Dumazet

author
#0 lore raw

PATCH 1/1 vlan: Use __vlan_hwaccel_put_tag() in rx

Commit 05423b241311c9380 (vlan: allow null VLAN ID to be used) forgot to update __vlan_hwaccel_rx() & vlan_gro_common()

We need to set VLAN_TAG_PRESENT flag in skb->vlan_tci

Signed-off-by Eric Dumazet <[email protected]>
---
 net/8021q/vlan_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/8021q/vlan_core.c +2 -2
index 8d5ca2a..971d375 100644
@@ -14,7 +14,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
 	if (skb_bond_should_drop(skb))
 		goto drop;
 
-	skb->vlan_tci = vlan_tci;
+	__vlan_hwaccel_put_tag(skb, vlan_tci);
 	skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
 
 	if (!skb->dev)

@@ -83,7 +83,7 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
 	if (skb_bond_should_drop(skb))
 		goto drop;
 
-	skb->vlan_tci = vlan_tci;
+	__vlan_hwaccel_put_tag(skb, vlan_tci);
 	skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
 
 	if (!skb->dev)
maintainer Applied
#1 lore raw

From: Eric Dumazet <[email protected]>
Date: Fri, 13 Nov 2009 17:33:11 +0100

Quoted 6 lines

Commit 05423b241311c9380 (vlan: allow null VLAN ID to be used) forgot to update __vlan_hwaccel_rx() & vlan_gro_common()

We need to set VLAN_TAG_PRESENT flag in skb->vlan_tci

Signed-off-by Eric Dumazet <[email protected]>

Applied, thanks.