The patch titled net: fix TX bug VLAN in VLAN has been added to the -mm tree. Its filename is net-fix-tx-bug-vlan-in-vlan.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: net: fix TX bug VLAN in VLAN From: "Joonwoo Park" <joonwpark81@xxxxxxxxx> This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=8766 Is it possible? BUG((veth->h_vlan_proto != htons(ETH_P_8021Q)) && !(VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR)) I'm afraid, queued packet before vconfig set_flag would do that. Signed-off-by: Joonwoo Park <joonwpark81@xxxxxxxxx> Cc: Ben Greear <greearb@xxxxxxxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Cc: Tristan Schmelcher <tristan_schmelcher@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- net/8021q/vlan_dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN net/8021q/vlan_dev.c~net-fix-tx-bug-vlan-in-vlan net/8021q/vlan_dev.c --- a/net/8021q/vlan_dev.c~net-fix-tx-bug-vlan-in-vlan +++ a/net/8021q/vlan_dev.c @@ -454,7 +454,9 @@ int vlan_dev_hard_header(struct sk_buff int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct net_device_stats *stats = vlan_dev_get_stats(dev); +#ifdef VLAN_DEBUG struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); +#endif /* Handle non-VLAN frames if they are sent to us, for example by DHCP. * @@ -462,7 +464,7 @@ 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 (VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR) { int orig_headroom = skb_headroom(skb); unsigned short veth_TCI; _ Patches currently in -mm which might be from joonwpark81@xxxxxxxxx are net-fix-tx-bug-vlan-in-vlan.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html