From 8078976d57224462222702d2717b095b969e025e Mon Sep 17 00:00:00 2001 From: Frank Blaschka Date: Mon, 8 Aug 2011 01:33:47 +0000 Subject: [PATCH] --- yaml --- r: 265288 b: refs/heads/master c: 1d31f52e38dfaf8bd07a6901c86fdd45e03eed24 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_l3_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9904bdba2438..7d62c3ebca32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f860b0522f65d3a0f8e6a4d908933737e1a82817 +refs/heads/master: 1d31f52e38dfaf8bd07a6901c86fdd45e03eed24 diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c index fafb8c299540..553b6686dd31 100644 --- a/trunk/drivers/s390/net/qeth_l3_main.c +++ b/trunk/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; } }