git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
SUNRPC: rpc_pipefs cleanup
[safe/jmp/linux-2.6]
/
drivers
/
net
/
macb.c
diff --git
a/drivers/net/macb.c
b/drivers/net/macb.c
index
7222659
..
5b5c253
100644
(file)
--- a/
drivers/net/macb.c
+++ b/
drivers/net/macb.c
@@
-645,7
+645,7
@@
static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
"BUG! Tx Ring full when queue awake!\n");
dev_dbg(&bp->pdev->dev, "tx_head = %u, tx_tail = %u\n",
bp->tx_head, bp->tx_tail);
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
entry = bp->tx_head;