diff options
Diffstat (limited to 'drivers/net/pcmcia/3c589_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 580977f56ad0..d6a459dd4894 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -563,7 +563,7 @@ static void el3_tx_timeout(struct net_device *dev) | |||
563 | netdev_warn(dev, "Transmit timed out!\n"); | 563 | netdev_warn(dev, "Transmit timed out!\n"); |
564 | dump_status(dev); | 564 | dump_status(dev); |
565 | dev->stats.tx_errors++; | 565 | dev->stats.tx_errors++; |
566 | dev->trans_start = jiffies; | 566 | dev->trans_start = jiffies; /* prevent tx timeout */ |
567 | /* Issue TX_RESET and TX_START commands. */ | 567 | /* Issue TX_RESET and TX_START commands. */ |
568 | tc589_wait_for_completion(dev, TxReset); | 568 | tc589_wait_for_completion(dev, TxReset); |
569 | outw(TxEnable, ioaddr + EL3_CMD); | 569 | outw(TxEnable, ioaddr + EL3_CMD); |
@@ -611,7 +611,6 @@ static netdev_tx_t el3_start_xmit(struct sk_buff *skb, | |||
611 | /* ... and the packet rounded to a doubleword. */ | 611 | /* ... and the packet rounded to a doubleword. */ |
612 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); | 612 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); |
613 | 613 | ||
614 | dev->trans_start = jiffies; | ||
615 | if (inw(ioaddr + TX_FREE) <= 1536) { | 614 | if (inw(ioaddr + TX_FREE) <= 1536) { |
616 | netif_stop_queue(dev); | 615 | netif_stop_queue(dev); |
617 | /* Interrupt us when the FIFO has room for max-sized packet. */ | 616 | /* Interrupt us when the FIFO has room for max-sized packet. */ |