---

yaml --- r: 224963 b: refs/heads/master c: 91d4576 h: refs/heads/master i: 224961: 478fdb2 224959: 3dd1b3e v: v3
git-mirror · Dec 10, 2010 · 75ed517 · 75ed517
1 parent 30e296b
commit 75ed517
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f154b79cd7db221240ab6e8e4d844d3a3f10b04c
+refs/heads/master: 91d4576bfe87980b1b86305c29912d96b96ce98e
diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c
@@ -3115,7 +3115,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 				skb_pull(new_skb, ETH_HLEN);
 		}
 
-		if (ipv == 6 && card->vlangrp &&
+		if (ipv != 4 && card->vlangrp &&
 				vlan_tx_tag_present(new_skb)) {
 			skb_push(new_skb, VLAN_HLEN);
 			skb_copy_to_linear_data(new_skb, new_skb->data + 4, 4);