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
gianfar: Remove legacy PM callbacks
[safe/jmp/linux-2.6]
/
drivers
/
net
/
lance.c
diff --git
a/drivers/net/lance.c
b/drivers/net/lance.c
index
7b94476
..
21f8ada
100644
(file)
--- a/
drivers/net/lance.c
+++ b/
drivers/net/lance.c
@@
-945,7
+945,7
@@
static void lance_tx_timeout (struct net_device *dev)
#endif
lance_restart (dev, 0x0043, 1);
#endif
lance_restart (dev, 0x0043, 1);
- dev->trans_start = jiffies;
+ dev->trans_start = jiffies;
/* prevent tx timeout */
netif_wake_queue (dev);
}
netif_wake_queue (dev);
}
@@
-1011,8
+1011,6
@@
static netdev_tx_t lance_start_xmit(struct sk_buff *skb,
outw(0x0000, ioaddr+LANCE_ADDR);
outw(0x0048, ioaddr+LANCE_DATA);
outw(0x0000, ioaddr+LANCE_ADDR);
outw(0x0048, ioaddr+LANCE_DATA);
- dev->trans_start = jiffies;
-
if ((lp->cur_tx - lp->dirty_tx) >= TX_RING_SIZE)
netif_stop_queue(dev);
if ((lp->cur_tx - lp->dirty_tx) >= TX_RING_SIZE)
netif_stop_queue(dev);