X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fsun3lance.c;h=534dfe3eef6ffdeabd173a1dbd00d0c20ae01a9f;hb=50d40b8e53fab58b0141a75f7448eb28f9e21338;hp=9bd9dadb8534bf4b1c2f240b34a0435e1db4923d;hpb=2160187a0a1cdeeeff1d41f53333bea91c82f259;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 9bd9dad..534dfe3 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c @@ -526,7 +526,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) if (netif_queue_stopped(dev)) { int tickssofar = jiffies - dev->trans_start; if (tickssofar < 20) - return( 1 ); + return NETDEV_TX_BUSY; DPRINTK( 1, ( "%s: transmit timed out, status %04x, resetting.\n", dev->name, DREG )); @@ -577,7 +577,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) if (test_and_set_bit( 0, (void*)&lp->lock ) != 0) { printk( "%s: tx queue lock!.\n", dev->name); /* don't clear dev->tbusy flag. */ - return 1; + return NETDEV_TX_BUSY; } AREG = CSR0;