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; }