diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-06 06:52:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-06 06:52:44 -0500 |
| commit | 655d2ce073f5927194dbc28d2bd3c062a4a3caac (patch) | |
| tree | 9fa289764e2b3cd8dbdc6d11299f0f16b93414b6 /drivers/net/tulip/xircom_cb.c | |
| parent | 9c1ca6e68a5d8d58776833b6496c0656a10be50c (diff) | |
| parent | 370076d932ff56a02b9c5328729a69d432cd4b32 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tulip/xircom_cb.c')
| -rw-r--r-- | drivers/net/tulip/xircom_cb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 8fc7274642eb..6b93d0169116 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
| @@ -441,7 +441,7 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 441 | spin_unlock_irqrestore(&card->lock,flags); | 441 | spin_unlock_irqrestore(&card->lock,flags); |
| 442 | trigger_transmit(card); | 442 | trigger_transmit(card); |
| 443 | 443 | ||
| 444 | return -EIO; | 444 | return NETDEV_TX_BUSY; |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | 447 | ||