1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 1e898b1c8068..569e269f282e 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -65,7 +65,6 @@ static int max_interrupt_work = 20;
 #include <linux/errno.h>
 #include <linux/in.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
 #include <linux/interrupt.h>
@@ -993,7 +992,7 @@ static void corkscrew_timeout(struct net_device *dev)
                 if (!(inw(ioaddr + EL3_STATUS) & CmdInProgress))
                         break;
         outw(TxEnable, ioaddr + EL3_CMD);
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         dev->stats.tx_errors++;
         dev->stats.tx_dropped++;
         netif_wake_queue(dev);
@@ -1056,7 +1055,6 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
                                 prev_entry->status &= ~0x80000000;
                         netif_wake_queue(dev);
                 }
-                dev->trans_start = jiffies;
                 return NETDEV_TX_OK;
         }
         /* Put out the doubleword header... */
@@ -1092,7 +1090,6 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
                 outw(SetTxThreshold + (1536 >> 2), ioaddr + EL3_CMD);
 #endif                          /* bus master */
 
-        dev->trans_start = jiffies;
 
         /* Clear the Tx status stack. */
         {