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
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
8139too.c
diff --git
a/drivers/net/8139too.c
b/drivers/net/8139too.c
index
0e2ba21
..
b39ec98
100644
(file)
--- a/
drivers/net/8139too.c
+++ b/
drivers/net/8139too.c
@@
-1707,7
+1707,7
@@
static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
} else {
dev_kfree_skb(skb);
dev->stats.tx_dropped++;
- return
0
;
+ return
NETDEV_TX_OK
;
}
spin_lock_irqsave(&tp->lock, flags);
@@
-1732,7
+1732,7
@@
static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
pr_debug("%s: Queued Tx packet size %u to slot %d.\n",
dev->name, len, entry);
- return
0
;
+ return
NETDEV_TX_OK
;
}