git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
tulip
/
winbond-840.c
diff --git
a/drivers/net/tulip/winbond-840.c
b/drivers/net/tulip/winbond-840.c
index
0f15773
..
1853530
100644
(file)
--- a/
drivers/net/tulip/winbond-840.c
+++ b/
drivers/net/tulip/winbond-840.c
@@
-1058,7
+1058,7
@@
static int start_tx(struct sk_buff *skb, struct net_device *dev)
printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n",
dev->name, np->cur_tx, entry);
}
- return
0
;
+ return
NETDEV_TX_OK
;
}
static void netdev_tx_done(struct net_device *dev)