[PATCH] 2.6.0-test6 - more free_netdev() conversion

Compiles ok (with true .o generated, yeah). Please review.

free_netdev() of devices allocated through use of alloc_netdev().
Though baroque, drivers/net/3c515.c now uses alloc_etherdev().

 drivers/net/3c515.c   |   23 ++++++++++++-----------
 drivers/net/defxx.c   |    2 +-
 drivers/net/dummy.c   |    2 +-
 drivers/net/eql.c     |    2 +-
 drivers/net/ns83820.c |    2 +-
 drivers/net/plip.c    |   14 ++++++++++----
 drivers/net/shaper.c  |   11 ++++++++---
 drivers/net/tun.c     |   18 +++++++++---------
 9 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index d3e3d819b9cbd698380f3b85812b4ba5b9355c29..a5d259b5b92d8395a542c413d0b6f14f4383e75c 100644 (file)
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -569,14 +569,13 @@ static struct net_device *corkscrew_found_device(struct net_device *dev,
 
 #ifdef MODULE
        /* Allocate and fill new device structure. */
-       int dev_size = sizeof(struct net_device) + sizeof(struct corkscrew_private) + 15;       /* Pad for alignment */
+       int dev_size = sizeof(struct corkscrew_private);
 
-       dev = (struct net_device *) kmalloc(dev_size, GFP_KERNEL);
+       dev = alloc_etherdev(dev_size);
        if (!dev)
-               return NULL;
+               goto err_out;
        memset(dev, 0, dev_size);
-       /* Align the Rx and Tx ring entries.  */
-       dev->priv = (void *) (((long) dev + sizeof(struct net_device) + 15) & ~15);
+
        vp = (struct corkscrew_private *) dev->priv;
        dev->base_addr = ioaddr;
        dev->irq = irq;
@@ -593,19 +592,16 @@ static struct net_device *corkscrew_found_device(struct net_device *dev,
                vp->full_duplex = 0;
                vp->bus_master = 0;
        }
-       ether_setup(dev);
        vp->next_module = root_corkscrew_dev;
        root_corkscrew_dev = dev;
        SET_MODULE_OWNER(dev);
-       if (register_netdev(dev) != 0) {
-               kfree(dev);
-               return NULL;
-       }
+       if (register_netdev(dev) < 0)
+               goto err_free_dev;
 #else                          /* not a MODULE */
        /* Caution: quad-word alignment required for rings! */
        dev->priv = kmalloc(sizeof(struct corkscrew_private), GFP_KERNEL);
        if (!dev->priv)
-               return NULL;
+               goto err_out;
        memset(dev->priv, 0, sizeof(struct corkscrew_private));
        dev = init_etherdev(dev, sizeof(struct corkscrew_private));
        dev->base_addr = ioaddr;
@@ -627,6 +623,11 @@ static struct net_device *corkscrew_found_device(struct net_device *dev,
        corkscrew_probe1(dev);
 #endif                         /* MODULE */
        return dev;
+
+err_free_dev:
+       free_netdev(dev);
+err_out:
+       return NULL;
 }
 
 static int corkscrew_probe1(struct net_device *dev)

diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 014df260b075006c306e60ed092cd6eecc36ea31..cada0c6691a3487d1702a8b58f6ed9f0070aaa91 100644 (file)
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -491,7 +491,7 @@ err_out_kfree:
 err_out_region:
        release_region(ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN);
 err_out:
-       kfree(dev);
+       free_netdev(dev);
        return err;
 }
 

diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 5ee716767f870f7e132dc3ef8c8b42918dd5274d..ca4688026a04891837a35c7b3d5d4b618017a222 100644 (file)
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -96,7 +96,7 @@ static int __init dummy_init_module(void)
                return -ENOMEM;
 
        if ((err = register_netdev(dev_dummy))) {
-               kfree(dev_dummy);
+               free_netdev(dev_dummy);
                dev_dummy = NULL;
        }
        return err;

diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 6f82a2d0236ee8f32763bd454a9f642f9f34fd81..0ee18be4a1e03fae0de536aac3b481d88fb09d10 100644 (file)
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -600,7 +600,7 @@ static int __init eql_init_module(void)
 
        err = register_netdev(dev_eql);
        if (err) 
-               kfree(dev_eql);
+               free_netdev(dev_eql);
        return err;
 }
 

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 67d71fc92eb56b14432dcfc98692a814b7f99513..3b57cbf2db7d216ecccd26bd43c27847f3d8285f 100644 (file)
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -2034,7 +2034,7 @@ out_disable:
        pci_free_consistent(pci_dev, 4 * DESC_SIZE * NR_RX_DESC, dev->rx_info.descs, dev->rx_info.phy_descs);
        pci_disable_device(pci_dev);
 out_free:
-       kfree(dev);
+       free_netdev(&dev->net_dev);
        pci_set_drvdata(pci_dev, NULL);
 out:
        return err;

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index e4cd7b02e29b117c0eb07cb548aa3d3ea349391b..8b8c640847d7bad1a21b5539c75e3f102a5a113b 100644 (file)
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -1306,17 +1306,23 @@ static void plip_attach (struct parport *port)
 
                if (!nl->pardev) {
                        printk(KERN_ERR "%s: parport_register failed\n", name);
-                       kfree(dev);
+                       goto err_free_dev;
                        return;
                }
 
                if (register_netdev(dev)) {
                        printk(KERN_ERR "%s: network register failed\n", name);
-                       kfree(dev);
-               } else {
-                       dev_plip[unit++] = dev;
+                       goto err_parport_unregister;
                }
+               dev_plip[unit++] = dev;
        }
+       return;
+
+err_parport_unregister:
+       parport_unregister_device(nl->pardev);
+err_free_dev:
+       free_netdev(dev);
+       return;
 }
 
 /* plip_detach() is called (by the parport code) when a port is

diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index 0e7f3159398fe56c2e41ab654af00aa4df9bf89c..e7ae3e6bb30f5fb1d92e09e6878e30ccd2fe87f3 100644 (file)
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -718,8 +718,10 @@ static int __init shaper_init(void)
                if (!dev) 
                        break;
 
-               if (register_netdev(dev))
+               if (register_netdev(dev)) {
+                       free_netdev(dev);
                        break;
+               }
 
                devs[i] = dev;
                shapers_registered++;
@@ -737,9 +739,12 @@ static void __exit shaper_exit (void)
 {
        int i;
 
-       for (i = 0; i < shapers_registered; i++)
-               if (devs[i])
+       for (i = 0; i < shapers_registered; i++) {
+               if (devs[i]) {
                        unregister_netdev(devs[i]);
+                       free_netdev(devs[i]);
+               }
+       }
 
        kfree(devs);
        devs = NULL;

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 784a41d78ebf8610bb9a5f814551f8b99e1dc8d9..a1b55e55ce955c7020f7f8f567c32579f156199a 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -377,6 +377,7 @@ static struct tun_struct *tun_get_by_name(const char *name)
 static int tun_set_iff(struct file *file, struct ifreq *ifr)
 {
        struct tun_struct *tun;
+       struct net_device *dev;
        int err;
 
        tun = tun_get_by_name(ifr->ifr_name);
@@ -394,7 +395,6 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
        else {
                char *name;
                unsigned long flags = 0;
-               struct net_device *dev;
 
                err = -EINVAL;
 
@@ -424,16 +424,13 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
 
                if (strchr(dev->name, '%')) {
                        err = dev_alloc_name(dev, dev->name);
-                       if (err < 0) {
-                               kfree(dev);
-                               goto failed;
-                       }
+                       if (err < 0)
+                               goto err_free_dev;
                }
 
-               if ((err = register_netdevice(tun->dev))) {
-                       kfree(dev);
-                       goto failed;
-               }
+               err = register_netdevice(tun->dev);
+               if (err < 0)
+                       goto err_free_dev;
        
                list_add(&tun->list, &tun_dev_list);
        }
@@ -451,6 +448,9 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
 
        strcpy(ifr->ifr_name, tun->dev->name);
        return 0;
+
+ err_free_dev:
+       free_netdev(dev);
  failed:
        return err;
 }