diff options
Diffstat (limited to 'drivers/net/lib82596.c')
-rw-r--r-- | drivers/net/lib82596.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 61c38ab4c247..de856d8abc90 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -963,7 +963,7 @@ static void i596_tx_timeout (struct net_device *dev) | |||
963 | lp->last_restart = dev->stats.tx_packets; | 963 | lp->last_restart = dev->stats.tx_packets; |
964 | } | 964 | } |
965 | 965 | ||
966 | dev->trans_start = jiffies; | 966 | dev->trans_start = jiffies; /* prevent tx timeout */ |
967 | netif_wake_queue (dev); | 967 | netif_wake_queue (dev); |
968 | } | 968 | } |
969 | 969 | ||
@@ -974,7 +974,6 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
974 | struct tx_cmd *tx_cmd; | 974 | struct tx_cmd *tx_cmd; |
975 | struct i596_tbd *tbd; | 975 | struct i596_tbd *tbd; |
976 | short length = skb->len; | 976 | short length = skb->len; |
977 | dev->trans_start = jiffies; | ||
978 | 977 | ||
979 | DEB(DEB_STARTTX, printk(KERN_DEBUG | 978 | DEB(DEB_STARTTX, printk(KERN_DEBUG |
980 | "%s: i596_start_xmit(%x,%p) called\n", | 979 | "%s: i596_start_xmit(%x,%p) called\n", |