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
/
e100.c
diff --git
a/drivers/net/e100.c
b/drivers/net/e100.c
index
41b648a
..
569df19
100644
(file)
--- a/
drivers/net/e100.c
+++ b/
drivers/net/e100.c
@@
-1720,7
+1720,7
@@
static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
}
netdev->trans_start = jiffies;
- return
0
;
+ return
NETDEV_TX_OK
;
}
static int e100_tx_clean(struct nic *nic)