diff options
Diffstat (limited to 'drivers/net/lance.c')
| -rw-r--r-- | drivers/net/lance.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index 7b9447646f8a..21f8adaa87c1 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
| @@ -945,7 +945,7 @@ static void lance_tx_timeout (struct net_device *dev) | |||
| 945 | #endif | 945 | #endif |
| 946 | lance_restart (dev, 0x0043, 1); | 946 | lance_restart (dev, 0x0043, 1); |
| 947 | 947 | ||
| 948 | dev->trans_start = jiffies; | 948 | dev->trans_start = jiffies; /* prevent tx timeout */ |
| 949 | netif_wake_queue (dev); | 949 | netif_wake_queue (dev); |
| 950 | } | 950 | } |
| 951 | 951 | ||
| @@ -1011,8 +1011,6 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb, | |||
| 1011 | outw(0x0000, ioaddr+LANCE_ADDR); | 1011 | outw(0x0000, ioaddr+LANCE_ADDR); |
| 1012 | outw(0x0048, ioaddr+LANCE_DATA); | 1012 | outw(0x0048, ioaddr+LANCE_DATA); |
| 1013 | 1013 | ||
| 1014 | dev->trans_start = jiffies; | ||
| 1015 | |||
| 1016 | if ((lp->cur_tx - lp->dirty_tx) >= TX_RING_SIZE) | 1014 | if ((lp->cur_tx - lp->dirty_tx) >= TX_RING_SIZE) |
| 1017 | netif_stop_queue(dev); | 1015 | netif_stop_queue(dev); |
| 1018 | 1016 | ||
