]> err.no Git - linux-2.6/commit
vlan: fix network_header/mac_header adjustments
authorPatrick McHardy <kaber@trash.net>
Tue, 8 Jul 2008 10:21:27 +0000 (03:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2008 10:21:27 +0000 (03:21 -0700)
commitacc81e1465d29e0284008770cc4b8bc90bd93bd7
tree7580b619f82a6ae13c425051c305b7d5501e201d
parent256f3bfce87fe39ec008b2c27890b30066984f50
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>
include/linux/if_vlan.h
net/8021q/vlan_dev.c