[netdrvr ARM] alloc_etherdev updates

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index a68b1315c76d266bcb2b23d5c042b6fea817bc2b..9362f3998495593a2cc950657e77a645e8f7452a 100644 (file)
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -657,7 +657,7 @@ static int __init am79c961_init(void)
        struct dev_priv *priv;
        int i, ret;
 
-       dev = init_etherdev(NULL, sizeof(struct dev_priv));
+       dev = alloc_etherdev(sizeof(struct dev_priv));
        ret = -ENOMEM;
        if (!dev)
                goto out;
@@ -715,12 +715,13 @@ static int __init am79c961_init(void)
        dev->set_multicast_list = am79c961_setmulticastlist;
        dev->tx_timeout         = am79c961_timeout;
 
-       return 0;
+       ret = register_netdev(dev);
+       if (ret == 0)
+               return 0;
 
 release:
        release_region(dev->base_addr, 0x18);
 nodev:
-       unregister_netdev(dev);
        kfree(dev);
 out:
        return ret;

diff --git a/drivers/net/arm/ether00.c b/drivers/net/arm/ether00.c
index d5a05d1d1cd3f70e8627d82cd6208e4ee0489311..12816c7ee439e95c183d89e5ee6a2ecce330d69d 100644 (file)
--- a/drivers/net/arm/ether00.c
+++ b/drivers/net/arm/ether00.c
@@ -706,16 +706,6 @@ static int ether00_open(struct net_device* dev)
        if (!is_valid_ether_addr(dev->dev_addr))
                return -EINVAL;
 
-       /* Allocate private memory */
-       dev->priv=kmalloc(sizeof(struct net_priv),GFP_KERNEL);
-       if(!dev->priv)
-               return -ENOMEM;
-       memset(dev->priv,0,sizeof(struct net_priv));
-       priv=(struct net_priv*)dev->priv;
-       priv->tq_memupdate.routine=ether00_mem_update;
-       priv->tq_memupdate.data=(void*) dev;
-       spin_lock_init(&priv->rx_lock);
-
        /* Install interrupt handlers */
        result=request_irq(dev->irq,ether00_int,0,"ether00",dev);
        if(result)
@@ -772,7 +762,6 @@ static int ether00_open(struct net_device* dev)
  open_err2:
        free_irq(dev->irq,dev);
  open_err1:
-       kfree(dev->priv);
        return result;
 
 }
@@ -848,7 +837,6 @@ static int ether00_stop(struct net_device* dev)
        free_irq(dev->irq,dev);
        free_irq(2,dev);
        iounmap(priv->dma_data);
-       kfree(priv);
 
        return 0;
 }
@@ -901,23 +889,6 @@ static void ether00_get_ethernet_address(struct net_device* dev)
 
 }
 
-static int ether00_init(struct net_device* dev)
-{
-
-       ether_setup(dev);
-
-       dev->open=ether00_open;
-       dev->stop=ether00_stop;
-       dev->set_multicast_list=ether00_set_multicast;
-       dev->hard_start_xmit=ether00_tx;
-       dev->get_stats=ether00_stats;
-
-       ether00_get_ethernet_address(dev);
-
-       SET_MODULE_OWNER(dev);
-       return 0;
-}
-
 /*
  * Keep a mapping of dev_info addresses -> port lines to use when
  * removing ports dev==NULL indicates unused entry
@@ -929,13 +900,13 @@ static struct net_device* dev_list[ETH_NR];
 static int ether00_add_device(struct pldhs_dev_info* dev_info,void* dev_ps_data)
 {
        struct net_device *dev;
+       struct net_priv *priv;
        void *map_addr;
        int result;
        int i;
 
-
        i=0;
-       while(dev_list[i])
+       while(dev_list[i] && i < ETH_NR)
                i++;
 
        if(i==ETH_NR){
@@ -944,37 +915,61 @@ static int ether00_add_device(struct pldhs_dev_info* dev_info,void* dev_ps_data)
        }
 
 
-       dev=kmalloc(sizeof(struct net_device),GFP_KERNEL);
-       if(!dev){
-               return -ENOMEM;
+       if (!request_mem_region(dev_info->base_addr, MAC_REG_SIZE, "ether00"))
+               return -EBUSY;
+
+       dev = alloc_etherdev(sizeof(struct net_priv));
+       if(!dev) {
+               result = -ENOMEM;
+               goto out_release;
        }
        memset(dev,0,sizeof(struct net_device));
+       memset(dev->priv, 0, sizeof(struct net_priv));
+       priv = dev->priv;
+
+       priv->tq_memupdate.routine=ether00_mem_update;
+       priv->tq_memupdate.data=(void*) dev;
+
+       spin_lock_init(&priv->rx_lock);
+
        map_addr=ioremap_nocache(dev_info->base_addr,SZ_4K);
        if(!map_addr){
-               return -ENOMEM;
+               result = -ENOMEM;
+               out_kfree;
        }
 
-       dev->init=ether00_init;
-       strcpy(dev->name,"eth%d");
+       dev->open=ether00_open;
+       dev->stop=ether00_stop;
+       dev->set_multicast_list=ether00_set_multicast;
+       dev->hard_start_xmit=ether00_tx;
+       dev->get_stats=ether00_stats;
+
+       ether00_get_ethernet_address(dev);
+
+       SET_MODULE_OWNER(dev);
+
        dev->base_addr=(unsigned int)map_addr;
        dev->irq=dev_info->irq;
        dev->features=NETIF_F_DYNALLOC | NETIF_F_HW_CSUM;
 
-       if(check_mem_region((unsigned int)map_addr, MAC_REG_SIZE)){
-               return -EBUSY;
-       }
-       request_mem_region((unsigned int)map_addr, MAC_REG_SIZE, "ether00");
-
        result=register_netdev(dev);
        if(result){
                printk("Ether00: Error %i registering driver\n",result);
-               return result;
+               goto out_unmap;
        }
        printk("registered ether00 device at %#x\n",dev_info->base_addr);
 
        dev_list[i]=dev;
 
        return result;
+
+ out_unmap:
+       iounmap(map_addr);
+ out_kfree:
+       kfree(dev);
+ out_release:
+       release_mem_region(dev_info->base_addr, MAC_REG_SIZE);
+       return result;
 }
 
 

diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 669a0179f97ecaafc78b33b53b781a0802895f7d..6195325d3973cfb3cb0779df8ad4df414f34989c 100644 (file)
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -722,7 +722,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)
        tx.tx_command = CMD_TX | CMD_INTR;
        tx.tx_link = nopaddr;
        tx.tx_tbdoffset = tbdaddr;
-       tbd.tbd_opts = TBD_EOL | len;
+       tbd.tbd_opts = TBD_EOL | skb->len;
        tbd.tbd_link = I82586_NULL;
        tbd.tbd_bufl = dataddr;
        tbd.tbd_bufh = 0;
@@ -1013,7 +1013,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
 
        ether1_banner();
 
-       dev = init_etherdev(NULL, sizeof(struct ether1_priv));
+       dev = alloc_etherdev(sizeof(struct ether1_priv));
        if (!dev) {
                ret = -ENOMEM;
                goto out;
@@ -1057,13 +1057,16 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
        dev->tx_timeout         = ether1_timeout;
        dev->watchdog_timeo     = 5 * HZ / 100;
 
+       ret = register_netdev(dev);
+       if (ret)
+               goto release;
+
        ecard_set_drvdata(ec, dev);
        return 0;
 
 release:
        release_region(dev->base_addr, 16);
        release_region(dev->base_addr + 0x800, 4096);
-       unregister_netdev(dev);
        kfree(dev);
 out:
        return ret;

diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 102c7dea7f13641ce1dcc3a4862e969dd9872601..8dc62828eaef550aff26939eec1528e32c7c503a 100644 (file)
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -822,7 +822,7 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
 
        ether3_banner();
 
-       dev = init_etherdev(NULL, sizeof(struct dev_priv));
+       dev = alloc_etherdev(sizeof(struct dev_priv));
        if (!dev) {
                ret = -ENOMEM;
                goto out;
@@ -898,13 +898,16 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
        dev->tx_timeout         = ether3_timeout;
        dev->watchdog_timeo     = 5 * HZ / 100;
 
+       ret = register_netdev(dev);
+       if (ret)
+               goto failed;
+
        ecard_set_drvdata(ec, dev);
        return 0;
 
 failed:
        release_region(dev->base_addr, 128);
 free:
-       unregister_netdev(dev);
        kfree(dev);
 out:
        return ret;

diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 72e6726230a469328e756aead1f2c70948fcee9f..73c3e9c93e14f73de51c674ec91b93094f9025d6 100644 (file)
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -551,14 +551,14 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 
        etherh_banner();
 
-       dev = init_etherdev(NULL, sizeof(struct etherh_priv));
+       dev = alloc_etherdev(sizeof(struct etherh_priv));
        if (!dev) {
                ret = -ENOMEM;
                goto out;
        }
 
        /*
-        * init_etherdev allocs and zeros dev->priv
+        * alloc_etherdev allocs and zeros dev->priv
         */
        eh = dev->priv;
 
@@ -694,17 +694,19 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
        etherh_reset(dev);
        NS8390_init(dev, 0);
 
+       ret = register_netdev(dev);
+       if (ret)
+               goto release;
+
        ecard_set_drvdata(ec, dev);
 
        return 0;
 
-release:
+ release:
        release_region(dev->base_addr, 16);
-free:
-       unregister_netdev(dev);
-       kfree(dev->priv);
+ free:
        kfree(dev);
-out:
+ out:
        return ret;
 }