---

yaml --- r: 171575 b: refs/heads/master c: b93ab83 h: refs/heads/master i: 171573: 7912b37 171571: e801d7f 171567: 24821eb v: v3
git-mirror · Nov 16, 2009 · 3e1a230 · 3e1a230
1 parent 7409e33
commit 3e1a230
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5d5d1721763842a516529e553433d13b11c3f31
+refs/heads/master: b93ab837a2d3eb394082c9eae4ee0a4f83060027
diff --git a/trunk/net/8021q/vlan_core.c b/trunk/net/8021q/vlan_core.c
@@ -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)