From 8810c4188bdbeac9ee6d2cdee25c0cdfe9fff2ee Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 8 Jul 2008 03:21:27 -0700 Subject: [PATCH] --- yaml --- r: 103335 b: refs/heads/master c: acc81e1465d29e0284008770cc4b8bc90bd93bd7 h: refs/heads/master i: 103333: 11eb80bf279aeaf36f08c34ca6a76077b88b0592 103331: 2f5b223e67eb667857d96ecab032c1e8be466c56 103327: 65f35b5df50051118765392e11a35094df80190f v: v3 --- [refs] | 2 +- trunk/include/linux/if_vlan.h | 2 -- trunk/net/8021q/vlan_dev.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 09c8d5aac8b1..e11e94c9329f 100644 --- 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 index 5190452ac7dc..8f5bf9b676aa 100644 --- 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 index a0617bf7cec6..4a8525927c27 100644 --- 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 */