diff options
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r-- | drivers/net/82596.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 97c5fc019cd4..dd8dc15556cb 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -1050,7 +1050,7 @@ static void i596_tx_timeout (struct net_device *dev) | |||
1050 | lp->last_restart = dev->stats.tx_packets; | 1050 | lp->last_restart = dev->stats.tx_packets; |
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | dev->trans_start = jiffies; | 1053 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1054 | netif_wake_queue (dev); | 1054 | netif_wake_queue (dev); |
1055 | } | 1055 | } |
1056 | 1056 | ||
@@ -1060,7 +1060,6 @@ static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1060 | struct tx_cmd *tx_cmd; | 1060 | struct tx_cmd *tx_cmd; |
1061 | struct i596_tbd *tbd; | 1061 | struct i596_tbd *tbd; |
1062 | short length = skb->len; | 1062 | short length = skb->len; |
1063 | dev->trans_start = jiffies; | ||
1064 | 1063 | ||
1065 | DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n", | 1064 | DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n", |
1066 | dev->name, skb->len, skb->data)); | 1065 | dev->name, skb->len, skb->data)); |