aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-07-08 06:21:27 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 06:21:27 -0400
commitacc81e1465d29e0284008770cc4b8bc90bd93bd7 (patch)
tree7580b619f82a6ae13c425051c305b7d5501e201d /net/8021q
parent256f3bfce87fe39ec008b2c27890b30066984f50 (diff)
vlan: fix network_header/mac_header adjustments
Lennert Buytenhek points out that the VLAN code incorrectly adjusts skb->network_header to point in the middle of the VLAN header and additionally tries to adjust skb->mac_header without checking for validity. The network_header should not be touched at all since we're only adding headers in front of it, mac_header adjustments are not necessary at all. Based on patch by Lennert Buytenhek <buytenh@wantstofly.org>. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index a0617bf7cec6..4a8525927c27 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -308,7 +308,6 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
308 vhdr->h_vlan_encapsulated_proto = htons(len); 308 vhdr->h_vlan_encapsulated_proto = htons(len);
309 309
310 skb->protocol = htons(ETH_P_8021Q); 310 skb->protocol = htons(ETH_P_8021Q);
311 skb_reset_network_header(skb);
312 } 311 }
313 312
314 /* Before delegating work to the lower layer, enter our MAC-address */ 313 /* Before delegating work to the lower layer, enter our MAC-address */