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/arm/ether3.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/arm/ether3.c')
| -rw-r--r-- | drivers/net/arm/ether3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c index ec8a1ae1e887..455037134aa3 100644 --- a/drivers/net/arm/ether3.c +++ b/drivers/net/arm/ether3.c | |||
| @@ -526,7 +526,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev) | |||
| 526 | 526 | ||
| 527 | if (priv(dev)->tx_tail == next_ptr) { | 527 | if (priv(dev)->tx_tail == next_ptr) { |
| 528 | local_irq_restore(flags); | 528 | local_irq_restore(flags); |
| 529 | return 1; /* unable to queue */ | 529 | return NETDEV_TX_BUSY; /* unable to queue */ |
| 530 | } | 530 | } |
| 531 | 531 | ||
| 532 | dev->trans_start = jiffies; | 532 | dev->trans_start = jiffies; |