---

yaml --- r: 103335 b: refs/heads/master c: acc81e1 h: refs/heads/master i: 103333: 11eb80b 103331: 2f5b223 103327: 65f35b5 v: v3
git-mirror · Jul 8, 2008 · 8810c41 · 8810c41
1 parent 05cbf0f
commit 8810c41
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 256f3bfce87fe39ec008b2c27890b30066984f50
+refs/heads/master: acc81e1465d29e0284008770cc4b8bc90bd93bd7
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
@@ -279,8 +279,6 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, unsigned short
 	veth->h_vlan_TCI = htons(tag);
 
 	skb->protocol = htons(ETH_P_8021Q);
-	skb->mac_header -= VLAN_HLEN;
-	skb->network_header -= VLAN_HLEN;
 
 	return skb;
 }

diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
@@ -308,7 +308,6 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
 			vhdr->h_vlan_encapsulated_proto = htons(len);
 
 		skb->protocol = htons(ETH_P_8021Q);
-		skb_reset_network_header(skb);
 	}
 
 	/* Before delegating work to the lower layer, enter our MAC-address */