Messages in this thread Patch in this message | | | Date | Wed, 12 Dec 2007 22:53:25 -0800 | From | Greg KH <> | Subject | [patch 50/60] VLAN: Fix nested VLAN transmit bug |
| |
2.6.23-stable review patch. If anyone has any objections, please let us know.
------------------ From: Joonwoo Park <joonwpark81@gmail.com>
[VLAN]: Fix nested VLAN transmit bug
[ Upstream commit: 6ab3b487db77fa98a24560f11a5a8e744b98d877 ]
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- net/8021q/vlan_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -459,7 +459,8 @@ int vlan_dev_hard_start_xmit(struct sk_b * 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; --
| |