1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index b32b7a1710b7..82eaf65d2d85 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -449,7 +449,6 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
                 pr_debug("%s", version);
 
         lp = netdev_priv(dev);
-        memset(lp, 0, sizeof(*lp));
         spin_lock_init(&lp->lock);
         lp->base = ioremap(dev->mem_start, RX_BUF_END);
         if (!lp->base) {
@@ -505,7 +504,7 @@ static void el16_tx_timeout (struct net_device *dev)
                 outb (0, ioaddr + SIGNAL_CA);   /* Issue channel-attn. */
                 lp->last_restart = dev->stats.tx_packets;
         }
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue (dev);
 }
 
@@ -529,7 +528,6 @@ static netdev_tx_t el16_send_packet (struct sk_buff *skb,
 
         hardware_send_packet (dev, buf, skb->len, length - skb->len);
 
-        dev->trans_start = jiffies;
         /* Enable the 82586 interrupt input. */
         outb (0x84, ioaddr + MISC_CTRL);
 
@@ -766,7 +764,6 @@ static void init_82586_mem(struct net_device *dev)
         if (net_debug > 4)
                 pr_debug("%s: Initialized 82586, status %04x.\n", dev->name,
                            readw(shmem+iSCB_STATUS));
-        return;
 }
 
 static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad)