aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorFrank Blaschka <frank.blaschka@de.ibm.com>2011-08-07 21:33:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-13 04:10:15 -0400
commit1d31f52e38dfaf8bd07a6901c86fdd45e03eed24 (patch)
treeca1cfde9baf6394a2fe61d5e3b172d8d8e3789d5 /drivers/s390/net
parentf860b0522f65d3a0f8e6a4d908933737e1a82817 (diff)
qeth: l3 ipv6 vlan not working on shared OSA chpid
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>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/qeth_l3_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index fafb8c299540..553b6686dd31 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2993,7 +2993,6 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
2993 tag = (u16 *)(new_skb->data + 12); 2993 tag = (u16 *)(new_skb->data + 12);
2994 *tag = __constant_htons(ETH_P_8021Q); 2994 *tag = __constant_htons(ETH_P_8021Q);
2995 *(tag + 1) = htons(vlan_tx_tag_get(new_skb)); 2995 *(tag + 1) = htons(vlan_tx_tag_get(new_skb));
2996 new_skb->vlan_tci = 0;
2997 } 2996 }
2998 } 2997 }
2999 2998