diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 23:32:24 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 23:32:24 +0200 |
| commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
| tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /drivers/net/sis900.c | |
| parent | dmaengine: at_hdmac: add DMA slave transfers (diff) | |
| parent | Linux 2.6.31-rc1 (diff) | |
| download | linux-a348a7e6fdbcd2d5192a09719a479bb238fde727.tar.xz linux-a348a7e6fdbcd2d5192a09719a479bb238fde727.zip | |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'drivers/net/sis900.c')
| -rw-r--r-- | drivers/net/sis900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 2d4617b3e208..a9a897bb42d5 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c @@ -1584,7 +1584,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) /* Don't transmit data before the complete of auto-negotiation */ if(!sis_priv->autong_complete){ netif_stop_queue(net_dev); - return 1; + return NETDEV_TX_BUSY; } spin_lock_irqsave(&sis_priv->lock, flags); |