From 5418791ee7bcd160691c5d719717dc4731216b25 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 5 Jul 2011 23:49:03 -0700
Subject: [PATCH] --- yaml --- r: 256134 b: refs/heads/master c:
 3600cdadb7ab9ee5f4e73ed01242c3e8b8e3282c h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/veth.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a9e2c4b00507..35e253d26a55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b7f7626743e0912958981343b47ac0ab2206b1c
+refs/heads/master: 3600cdadb7ab9ee5f4e73ed01242c3e8b8e3282c
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
index 9eb92bfa92ab..19e0b0c72f49 100644
--- a/trunk/drivers/net/veth.c
+++ b/trunk/drivers/net/veth.c
@@ -148,13 +148,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	return NETDEV_TX_OK;
 
-tx_drop:
-	kfree_skb(skb);
-	u64_stats_update_begin(&stats->syncp);
-	stats->tx_dropped++;
-	u64_stats_update_end(&stats->syncp);
-	return NETDEV_TX_OK;
-
 rx_drop:
 	u64_stats_update_begin(&rcv_stats->syncp);
 	rcv_stats->rx_dropped++;