diff options
| author | Joonwoo Park <[email protected]> | 2007-11-29 11:16:41 +0000 |
|---|---|---|
| committer | Herbert Xu <[email protected]> | 2007-11-29 11:16:41 +0000 |
| commit | 6ab3b487db77fa98a24560f11a5a8e744b98d877 (patch) | |
| tree | 66f991e167a0a4127b613a9cf2335c4d8a193a7b | |
| parent | [SUNGEM]: Fix NAPI regression with reset work (diff) | |
| download | kernel-6ab3b487db77fa98a24560f11a5a8e744b98d877.tar.gz kernel-6ab3b487db77fa98a24560f11a5a8e744b98d877.zip | |
[VLAN]: Fix nested VLAN transmit bug
Fix misbehavior of vlan_dev_hard_start_xmit() for recursive encapsulations.
Signed-off-by: Joonwoo Park <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 7a36878241da..4f99bb86af5c 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -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; |