projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[linux-2.6-block.git]
/
drivers
/
net
/
de620.c
diff --git
a/drivers/net/de620.c
b/drivers/net/de620.c
index 039bc1acadd3e0fa7b8035b200bbc400715e50d3..55d2bb67cffa66c9ecefcf7762bbad050c9727dd 100644
(file)
--- a/
drivers/net/de620.c
+++ b/
drivers/net/de620.c
@@
-531,7
+531,7
@@
static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
case (TXBF0 | TXBF1): /* NONE!!! */
printk(KERN_WARNING "%s: No tx-buffer available!\n", dev->name);
spin_unlock_irqrestore(&de620_lock, flags);
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
de620_write_block(dev, buffer, skb->len, len-skb->len);