diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/7990.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/7990.c')
| -rw-r--r-- | drivers/net/7990.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 7a331acc34ad..69f5b7d298a6 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
| @@ -541,7 +541,7 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
| 541 | unsigned long flags; | 541 | unsigned long flags; |
| 542 | 542 | ||
| 543 | if (!TX_BUFFS_AVAIL) | 543 | if (!TX_BUFFS_AVAIL) |
| 544 | return -1; | 544 | return NETDEV_TX_LOCKED; |
| 545 | 545 | ||
| 546 | netif_stop_queue (dev); | 546 | netif_stop_queue (dev); |
| 547 | 547 | ||