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 remote branch 'origin' into secretlab/next-devicetree
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ioc3-eth.c
diff --git
a/drivers/net/ioc3-eth.c
b/drivers/net/ioc3-eth.c
index
091ea33
..
e3b5e94
100644
(file)
--- a/
drivers/net/ioc3-eth.c
+++ b/
drivers/net/ioc3-eth.c
@@
-1503,7
+1503,6
@@
static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
BARRIER();
- dev->trans_start = jiffies;
ip->tx_skbs[produce] = skb; /* Remember skb */
produce = (produce + 1) & 127;
ip->tx_pi = produce;