aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atarilance.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/atarilance.c')
-rw-r--r--drivers/net/atarilance.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 280cfff48b49..b57d7dee389a 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -53,7 +53,6 @@ static char version[] = "atarilance.c: v1.3 04/04/96 "
53#include <linux/string.h> 53#include <linux/string.h>
54#include <linux/errno.h> 54#include <linux/errno.h>
55#include <linux/skbuff.h> 55#include <linux/skbuff.h>
56#include <linux/slab.h>
57#include <linux/interrupt.h> 56#include <linux/interrupt.h>
58#include <linux/init.h> 57#include <linux/init.h>
59#include <linux/bitops.h> 58#include <linux/bitops.h>
@@ -768,8 +767,8 @@ static void lance_tx_timeout (struct net_device *dev)
768 /* lance_restart, essentially */ 767 /* lance_restart, essentially */
769 lance_init_ring(dev); 768 lance_init_ring(dev);
770 REGA( CSR0 ) = CSR0_INEA | CSR0_INIT | CSR0_STRT; 769 REGA( CSR0 ) = CSR0_INEA | CSR0_INIT | CSR0_STRT;
771 dev->trans_start = jiffies; 770 dev->trans_start = jiffies; /* prevent tx timeout */
772 netif_wake_queue (dev); 771 netif_wake_queue(dev);
773} 772}
774 773
775/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ 774/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
@@ -837,7 +836,6 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
837 836
838 /* Trigger an immediate send poll. */ 837 /* Trigger an immediate send poll. */
839 DREG = CSR0_INEA | CSR0_TDMD; 838 DREG = CSR0_INEA | CSR0_TDMD;
840 dev->trans_start = jiffies;
841 839
842 if ((MEM->tx_head[(entry+1) & TX_RING_MOD_MASK].flag & TMD1_OWN) == 840 if ((MEM->tx_head[(entry+1) & TX_RING_MOD_MASK].flag & TMD1_OWN) ==
843 TMD1_OWN_HOST) 841 TMD1_OWN_HOST)