diff options
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 656be931207a..6622f0401794 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1295,7 +1295,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work) | |||
1295 | struct net_device *dev = local->dev; | 1295 | struct net_device *dev = local->dev; |
1296 | /* reset the card */ | 1296 | /* reset the card */ |
1297 | do_reset(dev,1); | 1297 | do_reset(dev,1); |
1298 | dev->trans_start = jiffies; | 1298 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1299 | netif_wake_queue(dev); | 1299 | netif_wake_queue(dev); |
1300 | } | 1300 | } |
1301 | 1301 | ||
@@ -1358,7 +1358,6 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1358 | PutByte(XIRCREG_CR, TransmitPacket|EnableIntr); | 1358 | PutByte(XIRCREG_CR, TransmitPacket|EnableIntr); |
1359 | 1359 | ||
1360 | dev_kfree_skb (skb); | 1360 | dev_kfree_skb (skb); |
1361 | dev->trans_start = jiffies; | ||
1362 | dev->stats.tx_bytes += pktlen; | 1361 | dev->stats.tx_bytes += pktlen; |
1363 | netif_start_queue(dev); | 1362 | netif_start_queue(dev); |
1364 | return NETDEV_TX_OK; | 1363 | return NETDEV_TX_OK; |