diff options
Diffstat (limited to 'drivers/net/3c509.c')
-rw-r--r-- | drivers/net/3c509.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index ab9bb3c52002..91abb965fb44 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -807,7 +807,7 @@ el3_tx_timeout (struct net_device *dev) | |||
807 | dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS), | 807 | dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS), |
808 | inw(ioaddr + TX_FREE)); | 808 | inw(ioaddr + TX_FREE)); |
809 | dev->stats.tx_errors++; | 809 | dev->stats.tx_errors++; |
810 | dev->trans_start = jiffies; | 810 | dev->trans_start = jiffies; /* prevent tx timeout */ |
811 | /* Issue TX_RESET and TX_START commands. */ | 811 | /* Issue TX_RESET and TX_START commands. */ |
812 | outw(TxReset, ioaddr + EL3_CMD); | 812 | outw(TxReset, ioaddr + EL3_CMD); |
813 | outw(TxEnable, ioaddr + EL3_CMD); | 813 | outw(TxEnable, ioaddr + EL3_CMD); |
@@ -868,7 +868,6 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
868 | /* ... and the packet rounded to a doubleword. */ | 868 | /* ... and the packet rounded to a doubleword. */ |
869 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); | 869 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); |
870 | 870 | ||
871 | dev->trans_start = jiffies; | ||
872 | if (inw(ioaddr + TX_FREE) > 1536) | 871 | if (inw(ioaddr + TX_FREE) > 1536) |
873 | netif_start_queue(dev); | 872 | netif_start_queue(dev); |
874 | else | 873 | else |
@@ -1038,7 +1037,6 @@ static void update_stats(struct net_device *dev) | |||
1038 | /* Back to window 1, and turn statistics back on. */ | 1037 | /* Back to window 1, and turn statistics back on. */ |
1039 | EL3WINDOW(1); | 1038 | EL3WINDOW(1); |
1040 | outw(StatsEnable, ioaddr + EL3_CMD); | 1039 | outw(StatsEnable, ioaddr + EL3_CMD); |
1041 | return; | ||
1042 | } | 1040 | } |
1043 | 1041 | ||
1044 | static int | 1042 | static int |