diff options
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index c516c1996354..ca4efd2871f3 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -903,7 +903,7 @@ static void mace_tx_timeout(struct net_device *dev) | |||
903 | #else /* #if RESET_ON_TIMEOUT */ | 903 | #else /* #if RESET_ON_TIMEOUT */ |
904 | printk("NOT resetting card\n"); | 904 | printk("NOT resetting card\n"); |
905 | #endif /* #if RESET_ON_TIMEOUT */ | 905 | #endif /* #if RESET_ON_TIMEOUT */ |
906 | dev->trans_start = jiffies; | 906 | dev->trans_start = jiffies; /* prevent tx timeout */ |
907 | netif_wake_queue(dev); | 907 | netif_wake_queue(dev); |
908 | } | 908 | } |
909 | 909 | ||
@@ -945,8 +945,6 @@ static netdev_tx_t mace_start_xmit(struct sk_buff *skb, | |||
945 | outb(skb->data[skb->len-1], ioaddr + AM2150_XMT); | 945 | outb(skb->data[skb->len-1], ioaddr + AM2150_XMT); |
946 | } | 946 | } |
947 | 947 | ||
948 | dev->trans_start = jiffies; | ||
949 | |||
950 | #if MULTI_TX | 948 | #if MULTI_TX |
951 | if (lp->tx_free_frames > 0) | 949 | if (lp->tx_free_frames > 0) |
952 | netif_start_queue(dev); | 950 | netif_start_queue(dev); |