[PATCH] tms380tr patch 1/3 (bug fix)

Hi Jeff,

this fixes some problems partly introduced in the latest token ring
update:
- mix of alloc_trdev(0) and alloc_trdev(sizeof(struct net_local)) confused
  memory management.
- initialization of proteon and sknet cards was broken.
- proteon_close() and skisa_close() deleted.

--jochen

 abyss.c    |    2 -
 madgemc.c  |    2 -
 proteon.c  |   91 ++++++++++++++++++++++++-------------------------------
 skisa.c    |  100 +++++++++++++++++++++++++------------------------------------
 tms380tr.c |   41 +++++++++----------------
 tmspci.c   |    2 -
 6 files changed, 100 insertions(+), 138 deletions(-)

diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index af510325ddd62f8cabed47f78a185afb56c034df..f04f9319affc84d325d660c084cc11bfa0fef345 100644 (file)
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -112,7 +112,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
                
        /* At this point we have found a valid card. */
                
-       dev = alloc_trdev(0);
+       dev = alloc_trdev(sizeof(struct net_local));
        if (!dev)
                return -ENOMEM;
 

diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index ddbd3e2493f609d0f62ced36075a7c0a2dd41e45..07f182ad0ac01200c360227300e339d5e7bfd16b 100644 (file)
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -177,7 +177,7 @@ static int __init madgemc_probe(void)
                if (versionprinted++ == 0)
                        printk("%s", version);
 
-               dev = alloc_trdev(0);
+               dev = alloc_trdev(sizeof(struct net_local));
                if (dev == NULL) {
                        printk("madgemc: unable to allocate dev space\n");
                        if (madgemc_card_list)

diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index 5ceee621b537ebe2028caed8c94996f04d7b90ba..23bbf012df1a7fa9fddcf8dcbbf8d30b91680c62 100644 (file)
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -65,7 +65,6 @@ static char cardname[] = "Proteon 1392\0";
 
 struct net_device *proteon_probe(int unit);
 static int proteon_open(struct net_device *dev);
-static int proteon_close(struct net_device *dev);
 static void proteon_read_eeprom(struct net_device *dev);
 static unsigned short proteon_setnselout_pins(struct net_device *dev);
 
@@ -117,21 +116,15 @@ nodev:
        return -ENODEV;
 }
 
-struct net_device * __init proteon_probe(int unit)
+static int __init setup_card(struct net_device *dev)
 {
-       struct net_device *dev = alloc_trdev(sizeof(struct net_local));
        struct net_local *tp;
         static int versionprinted;
        const unsigned *port;
        int j,err = 0;
 
        if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       if (unit >= 0) {
-               sprintf(dev->name, "tr%d", unit);
-               netdev_boot_setup_check(dev);
-       }
+               return -ENOMEM;
 
        SET_MODULE_OWNER(dev);
        if (dev->base_addr)     /* probe specific location */
@@ -178,7 +171,7 @@ struct net_device * __init proteon_probe(int unit)
        tp->tmspriv = NULL;
 
        dev->open = proteon_open;
-       dev->stop = proteon_close;
+       dev->stop = tms380tr_close;
 
        if (dev->irq == 0)
        {
@@ -257,7 +250,7 @@ struct net_device * __init proteon_probe(int unit)
        if (err)
                goto out;
 
-       return dev;
+       return 0;
 out:
        free_dma(dev->dma);
 out2:
@@ -266,6 +259,29 @@ out3:
        tmsdev_term(dev);
 out4:
        release_region(dev->base_addr, PROTEON_IO_EXTENT); 
+       return err;
+}
+
+struct net_device * __init proteon_probe(int unit)
+{
+       struct net_device *dev = alloc_trdev(sizeof(struct net_local));
+       int err = 0;
+
+       if (!dev)
+               return ERR_PTR(-ENOMEM);
+
+       if (unit >= 0) {
+               sprintf(dev->name, "tr%d", unit);
+               netdev_boot_setup_check(dev);
+       }
+
+       err = setup_card(dev);
+       if (err)
+               goto out;
+
+       return dev;
+
+out:
        free_netdev(dev);
        return ERR_PTR(err);
 }
@@ -333,14 +349,7 @@ static int proteon_open(struct net_device *dev)
        val |= i;
        outb(val, dev->base_addr + 0x13);
 
-       tms380tr_open(dev);
-       return 0;
-}
-
-static int proteon_close(struct net_device *dev)
-{
-       tms380tr_close(dev);
-       return 0;
+       return tms380tr_open(dev);
 }
 
 #ifdef MODULE
@@ -359,45 +368,25 @@ MODULE_PARM(dma, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
 
 static struct net_device *proteon_dev[ISATR_MAX_ADAPTERS];
 
-static struct net_device * __init setup_card(unsigned long io, unsigned irq, unsigned char dma)
-{
-       struct net_device *dev = alloc_trdev(sizeof(struct net_local));
-       int err;
-
-       if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       dev->irq = irq;
-       dev->dma = dma;
-       err = proteon_probe1(dev, io);
-       if (err) 
-               goto out;
-               
-       err = register_netdev(dev);
-       if (err)
-               goto out1;
-       return dev;
- out1:
-       release_region(dev->base_addr, PROTEON_IO_EXTENT);
-       free_irq(dev->irq, dev);
-       free_dma(dev->dma);
-       tmsdev_term(dev);
- out:
-       free_netdev(dev);
-       return ERR_PTR(err);
-}
-
 int init_module(void)
 {
        struct net_device *dev;
-       int i, num = 0;
+       int i, num = 0, err = 0;
 
        for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
-               dev = io[0] ? setup_card(io[i], irq[i], dma[i])
-                       : proteon_probe(-1);
-               if (!IS_ERR(dev)) {
+               dev = alloc_trdev(sizeof(struct net_local));
+               if (!dev)
+                       continue;
+
+               dev->base_addr = io[i];
+               dev->irq = irq[i];
+               dev->dma = dma[i];
+               err = setup_card(dev);
+               if (!err) {
                        proteon_dev[i] = dev;
                        ++num;
+               } else {
+                       free_netdev(dev);
                }
        }
 

diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 89897535a28c64b73f63045e6f12fe75839d912f..c1fcc377a4fac17b81bc106ac12d42403cdb8f35 100644 (file)
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -69,8 +69,8 @@ static int dmalist[] __initdata = {
 
 static char isa_cardname[] = "SK NET TR 4/16 ISA\0";
 
+struct net_device *sk_isa_probe(int unit);
 static int sk_isa_open(struct net_device *dev);
-static int sk_isa_close(struct net_device *dev);
 static void sk_isa_read_eeprom(struct net_device *dev);
 static unsigned short sk_isa_setnselout_pins(struct net_device *dev);
 
@@ -133,21 +133,15 @@ static int __init sk_isa_probe1(struct net_device *dev, int ioaddr)
        return 0;
 }
 
-struct net_device * __init sk_isa_probe(int unit)
+static int __init setup_card(struct net_device *dev)
 {
-       struct net_device *dev = alloc_trdev(sizeof(struct net_local));
        struct net_local *tp;
         static int versionprinted;
        const unsigned *port;
        int j, err = 0;
 
        if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       if (unit >= 0) {
-               sprintf(dev->name, "tr%d", unit);
-               netdev_boot_setup_check(dev);
-       }
+               return -ENOMEM;
 
        SET_MODULE_OWNER(dev);
        if (dev->base_addr)     /* probe specific location */
@@ -194,7 +188,7 @@ struct net_device * __init sk_isa_probe(int unit)
        tp->tmspriv = NULL;
 
        dev->open = sk_isa_open;
-       dev->stop = sk_isa_close;
+       dev->stop = tms380tr_close;
 
        if (dev->irq == 0)
        {
@@ -273,7 +267,7 @@ struct net_device * __init sk_isa_probe(int unit)
        if (err)
                goto out;
 
-       return dev;
+       return 0;
 out:
        free_dma(dev->dma);
 out2:
@@ -282,6 +276,28 @@ out3:
        tmsdev_term(dev);
 out4:
        release_region(dev->base_addr, SK_ISA_IO_EXTENT); 
+       return err;
+}
+
+struct net_device * __init sk_isa_probe(int unit)
+{
+       struct net_device *dev = alloc_trdev(sizeof(struct net_local));
+       int err = 0;
+
+       if (!dev)
+               return ERR_PTR(-ENOMEM);
+
+       if (unit >= 0) {
+               sprintf(dev->name, "tr%d", unit);
+               netdev_boot_setup_check(dev);
+       }
+
+       err = setup_card(dev);
+       if (err)
+               goto out;
+
+       return dev;
+out:
        free_netdev(dev);
        return ERR_PTR(err);
 }
@@ -342,22 +358,13 @@ static int sk_isa_open(struct net_device *dev)
        val &= oldval;
        sk_isa_sifwriteb(dev, val, POSREG);
 
-       tms380tr_open(dev);
-       return 0;
-}
-
-static int sk_isa_close(struct net_device *dev)
-{
-       tms380tr_close(dev);
-       return 0;
+       return tms380tr_open(dev);
 }
 
 #ifdef MODULE
 
 #define ISATR_MAX_ADAPTERS 3
 
-static struct net_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
-
 static int io[ISATR_MAX_ADAPTERS];
 static int irq[ISATR_MAX_ADAPTERS];
 static int dma[ISATR_MAX_ADAPTERS];
@@ -368,51 +375,28 @@ MODULE_PARM(io, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
 MODULE_PARM(irq, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
 MODULE_PARM(dma, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
 
-static struct net_device * __init setup_card(unsigned long io, unsigned irq, unsigned char dma)
-{
-       struct net_device *dev = alloc_trdev(sizeof(struct net_local));
-       int err;
-
-       if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       dev->base_addr = io;
-       dev->irq       = irq;
-       dev->dma       = dma;
-
-       err = sk_isa_probe1(dev, io);
-       if (err)
-               goto out;
-
-       err = register_netdev(dev);
-       if (err)
-               goto out1;
-       return dev;
-
- out1:
-       release_region(dev->base_addr, SK_ISA_IO_EXTENT);
-       free_irq(dev->irq, dev);
-       free_dma(dev->dma);
-       tmsdev_term(dev);
- out:
-       free_netdev(dev);
-       return ERR_PTR(err);
-}
+static struct net_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
 
 int init_module(void)
 {
        struct net_device *dev;
-       int i, num;
+       int i, num = 0, err = 0;
 
-       num = 0;
        for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
-               if (io[0])  /* Only probe addresses from command line */
-                       dev = setup_card(io[i], irq[i], dma[i]);
-               else
-                       dev = sk_isa_probe(-1);
-               if (!IS_ERR(dev)) {
+               dev = alloc_trdev(sizeof(struct net_local));
+               if (!dev)
+                       continue;
+
+               dev->base_addr = io[i];
+               dev->irq = irq[i];
+               dev->dma = dma[i];
+               err = setup_card(dev);
+
+               if (!err) {
                        sk_isa_dev[i] = dev;
                        ++num;
+               } else {
+                       free_netdev(dev);
                }
        }
 

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index e781c816a344da50f360edb06de0ff9bf3228aeb..0c9128ee23436f844d0830dd7a27cf979e6e8c14 100644 (file)
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -246,6 +246,7 @@ int tms380tr_open(struct net_device *dev)
        
        /* init the spinlock */
        spin_lock_init(&tp->lock);
+       init_timer(&tp->timer);
 
        /* Reset the hardware here. Don't forget to set the station address. */
 
@@ -266,7 +267,6 @@ int tms380tr_open(struct net_device *dev)
                return (-1);
        }
 
-       init_timer(&tp->timer);
        tp->timer.expires       = jiffies + 30*HZ;
        tp->timer.function      = tms380tr_timer_end_wait;
        tp->timer.data          = (unsigned long)dev;
@@ -2342,37 +2342,26 @@ void tmsdev_term(struct net_device *dev)
        tp = (struct net_local *) dev->priv;
        pci_unmap_single(tp->pdev, tp->dmabuffer, sizeof(struct net_local),
                PCI_DMA_BIDIRECTIONAL);
-       kfree(dev->priv);
 }
 
 int tmsdev_init(struct net_device *dev, unsigned long dmalimit, 
                struct pci_dev *pdev)
 {
-       if (dev->priv == NULL)
+       struct net_local *tms_local;
+
+       memset(dev->priv, 0, sizeof(struct net_local));
+       tms_local = (struct net_local *)dev->priv;
+       init_waitqueue_head(&tms_local->wait_for_tok_int);
+       tms_local->dmalimit = dmalimit;
+       tms_local->pdev = pdev;
+       tms_local->dmabuffer = pci_map_single(pdev, (void *)tms_local,
+           sizeof(struct net_local), PCI_DMA_BIDIRECTIONAL);
+       if (tms_local->dmabuffer + sizeof(struct net_local) > dmalimit)
        {
-               struct net_local *tms_local;
-               
-               dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL | GFP_DMA);
-               if (dev->priv == NULL)
-               {
-                        printk(KERN_INFO "%s: Out of memory for DMA\n",
-                                dev->name);
-                       return -ENOMEM;
-               }
-               memset(dev->priv, 0, sizeof(struct net_local));
-               tms_local = (struct net_local *)dev->priv;
-               init_waitqueue_head(&tms_local->wait_for_tok_int);
-               tms_local->dmalimit = dmalimit;
-               tms_local->pdev = pdev;
-                tms_local->dmabuffer = pci_map_single(pdev, (void *)tms_local,
-                        sizeof(struct net_local), PCI_DMA_BIDIRECTIONAL);
-                if (tms_local->dmabuffer + sizeof(struct net_local) > dmalimit)
-                {
-                       printk(KERN_INFO "%s: Memory not accessible for DMA\n",
-                               dev->name);
-                       tmsdev_term(dev);
-                       return -ENOMEM;
-               }
+               printk(KERN_INFO "%s: Memory not accessible for DMA\n",
+                       dev->name);
+               tmsdev_term(dev);
+               return -ENOMEM;
        }
        
        /* These can be overridden by the card driver if needed */

diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 56dfea69b2f9848ac2a338d60f45fc0d70eb0e06..cb89ec15f43349f1e150aedc3dfe79310ab36f4e 100644 (file)
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -112,7 +112,7 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
        pci_ioaddr = pci_resource_start (pdev, 0);
 
        /* At this point we have found a valid card. */
-       dev = alloc_trdev(0);
+       dev = alloc_trdev(sizeof(struct net_local));
        if (!dev)
                return -ENOMEM;
        SET_MODULE_OWNER(dev);