Merge branch 'thinkpad' into release

[linux-2.6-block.git] / drivers / net / sunlance.c

diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index afc7b351e5ec43a5723290ca7e958a08806bf544..9d6fd4760eab0082a5b58c8087b588531be983eb 100644 (file)
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1163,7 +1163,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dev->trans_start = jiffies;
        dev_kfree_skb(skb);
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /* taken from the depca driver */