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 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sonic.c
diff --git
a/drivers/net/sonic.c
b/drivers/net/sonic.c
index
e5d6732
..
26e25d7
100644
(file)
--- a/
drivers/net/sonic.c
+++ b/
drivers/net/sonic.c
@@
-174,7
+174,7
@@
static void sonic_tx_timeout(struct net_device *dev)
/* Try to restart the adaptor. */
sonic_init(dev);
lp->stats.tx_errors++;
/* Try to restart the adaptor. */
sonic_init(dev);
lp->stats.tx_errors++;
- dev->trans_start = jiffies;
+ dev->trans_start = jiffies;
/* prevent tx timeout */
netif_wake_queue(dev);
}
netif_wake_queue(dev);
}
@@
-263,8
+263,6
@@
static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP);
SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP);
- dev->trans_start = jiffies;
-
return NETDEV_TX_OK;
}
return NETDEV_TX_OK;
}