Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / net / smc9194.c

diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 9e5e9e7..7486d09 100644 (file)
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -64,7 +64,6 @@ static const char version[] =
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
@@ -692,8 +691,6 @@ static void smc_hardware_send_packet( struct net_device * dev )
 
        /* we can send another packet */
        netif_wake_queue(dev);
-
-       return;
 }
 
 /*-------------------------------------------------------------------------
@@ -1043,9 +1040,6 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
        */
        printk("ADDR: %pM\n", dev->dev_addr);
 
-       /* set the private data to zero by default */
-       memset(netdev_priv(dev), 0, sizeof(struct smc_local));
-
        /* Grab the IRQ */
        retval = request_irq(dev->irq, smc_interrupt, 0, DRV_NAME, dev);
        if (retval) {
@@ -1168,7 +1162,7 @@ static void smc_timeout(struct net_device *dev)
        /* "kick" the adaptor */
        smc_reset( dev->base_addr );
        smc_enable( dev->base_addr );
-       dev->trans_start = jiffies;
+       dev->trans_start = jiffies; /* prevent tx timeout */
        /* clear anything saved */
        ((struct smc_local *)netdev_priv(dev))->saved_skb = NULL;
        netif_wake_queue(dev);
@@ -1359,7 +1353,6 @@ static void smc_tx( struct net_device * dev )
        lp->packets_waiting--;
 
        outb( saved_packet, ioaddr + PNR_ARR );
-       return;
 }
 
 /*--------------------------------------------------------------------