Messages in this thread Patch in this message | | | From | "Joonwoo Park" <> | Subject | RE: [PATCH] [NET]: Fix TX bug VLAN in VLAN | Date | Tue, 27 Nov 2007 16:02:19 +0900 |
| |
2007/11/27, Herbert Xu <herbert@gondor.apana.org.au>: > On Tue, Nov 27, 2007 at 02:32:49PM +0900, Joonwoo Park wrote: > > > > Thanks Herbert. > > Well.. I think patch would work propely for AF_PACKET also. > > (I did not insert BUG() macro in my patch) > > How do you think? > > Are you sure? I thought you need to check both in the xmit function. > That is, > > if (veth->h_vlan_proto != htons(ETH_P_8021Q) || > VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR) { > > Otherwise you'll miss AF_PACKET packets when REORDER is off.
Thanks Herbert! I agree with you.
Thanks. Joonwoo
[NET]: Fix TX bug VLAN in VLAN Fix misbehavior of vlan_dev_hard_start_xmit() for recursive encapsulations.
Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
--- diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 7a36878..4f99bb8 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; --- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |