From 78cd2f8d815518d815ae3bd96ef104e2102b79d6 Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Thu, 25 Feb 2010 13:50:19 +0000
Subject: [PATCH] --- yaml --- r: 184521 b: refs/heads/master c:
 c43491d73ea04277c92a4aa1a7e63ccab4577756 h: refs/heads/master i:   184519:
 3ebdbe0a4d4fbefad26bb452e3fc084b5d3487c9 v: v3

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

diff --git a/[refs] b/[refs]
index c1e6935f0565..784840f65cbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e26d75f490d7d41f25a4b39ed6db1713beb417
+refs/heads/master: c43491d73ea04277c92a4aa1a7e63ccab4577756
diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c
index d75b46141603..2b9c1cbc9ec1 100644
--- a/trunk/drivers/net/greth.c
+++ b/trunk/drivers/net/greth.c
@@ -560,8 +560,6 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
 	if (net_ratelimit())
 		dev_warn(greth->dev, "Could not create TX DMA mapping\n");
 	dev_kfree_skb(skb);
-	return NETDEV_TX_OK;
-
 out:
 	return err;
 }