Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ab3b487 authored Nov 29, 2007 by Joonwoo Park Committed by Herbert Xu Nov 29, 2007

[VLAN]: Fix nested VLAN transmit bug



Fix misbehavior of vlan_dev_hard_start_xmit() for recursive encapsulations.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent dde655c9

net/8021q/vlan_dev.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -462,7 +462,8 @@ int vlan_dev_hard_start_xmit(struct sk_buff skb, struct net_device dev)
		* OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
		*/

		if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {
		if (veth->h_vlan_proto != htons(ETH_P_8021Q) \|\|
		VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR) {
		int orig_headroom = skb_headroom(skb);
		unsigned short veth_TCI;