From 75ed517aa3f3b583e0a3aa6ce0f7f0b359eeb55c Mon Sep 17 00:00:00 2001 From: Frank Blaschka Date: Wed, 8 Dec 2010 02:58:00 +0000 Subject: [PATCH] --- yaml --- r: 224963 b: refs/heads/master c: 91d4576bfe87980b1b86305c29912d96b96ce98e h: refs/heads/master i: 224961: 478fdb2d39859068666e81a4f9a14a3483353d85 224959: 3dd1b3ea8a807295e1bf7061d216de1db75d6f79 v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_l3_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b04150a7e4f0..301399e67898 100644 --- 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 index d5e40c3e4bc3..e227e465bfc4 100644 --- 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);