qeth: l3 ipv6 vlan not working on shared OSA chpid
authorFrank Blaschka <frank.blaschka@de.ibm.com>
Mon, 8 Aug 2011 01:33:47 +0000 (01:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Aug 2011 08:10:15 +0000 (01:10 -0700)
In layer 3 mode IPv6 over VLAN does not work on newer OSA  levels in
case the sender and receiver run on the same (shared) OSA adapter.
Keep vlan info in the skb so the qdio header is filled with the
required vlan tag.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_l3_main.c

index fafb8c299540e02218161711591ac049ec65dbb5..553b6686dd31d72cf9f0c2f3b3d20a04e3d71e57 100644 (file)
@@ -2993,7 +2993,6 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        tag = (u16 *)(new_skb->data + 12);
                        *tag = __constant_htons(ETH_P_8021Q);
                        *(tag + 1) = htons(vlan_tx_tag_get(new_skb));
-                       new_skb->vlan_tci = 0;
                }
        }