From: Frank Blaschka <frank.blaschka@de.ibm.com>
Date: Mon, 8 Aug 2011 01:33:47 +0000 (+0000)
Subject: qeth: l3 ipv6 vlan not working on shared OSA chpid
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1d31f52e38dfaf8bd07a6901c86fdd45e03eed24;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index fafb8c29954..553b6686dd3 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)
 			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;
 		}
 	}