Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6

[sfrench/cifs-2.6.git] / drivers / net / a2065.c

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 02f64d57864163d05c6e5714e694d635e4373070..85a18175730ba249ab36c5985a654e34df1eb05c 100644 (file)
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -564,7 +564,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
        if (!TX_BUFFS_AVAIL){
                local_irq_restore(flags);
-               return -1;
+               return NETDEV_TX_LOCKED;
        }
 
 #ifdef DEBUG_DRIVER