| To: | Jeff Garzik <jgarzik@xxxxxxxxx>, Jes Sorenson <jes@xxxxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | [PATCH 2.5.70] acenic -- update to use alloc_etherdev |
| From: | Stephen Hemminger <shemminger@xxxxxxxx> |
| Date: | Wed, 11 Jun 2003 14:42:49 -0700 |
| Cc: | netdev@xxxxxxxxxxx |
| Organization: | Open Source Development Lab |
| Sender: | netdev-bounce@xxxxxxxxxxx |
Updated acenic driver to use alloc_etherdev to hold private data structure.
Uses register_netdev() to get the name right this time ;-)
Tested against 2.5.70 bk latest on Tigon III board.
diff -Nru a/drivers/net/acenic.c b/drivers/net/acenic.c
--- a/drivers/net/acenic.c Wed Jun 11 14:36:47 2003
+++ b/drivers/net/acenic.c Wed Jun 11 14:36:47 2003
@@ -642,8 +642,7 @@
(pdev->device == PCI_DEVICE_ID_SGI_ACENIC)))
continue;
- dev = init_etherdev(NULL, sizeof(struct ace_private));
-
+ dev = alloc_etherdev(sizeof(struct ace_private));
if (dev == NULL) {
printk(KERN_ERR "acenic: Unable to allocate "
"net_device structure!\n");
@@ -653,13 +652,6 @@
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
- if (!dev->priv)
- dev->priv = kmalloc(sizeof(*ap), GFP_KERNEL);
- if (!dev->priv) {
- printk(KERN_ERR "acenic: Unable to allocate memory\n");
- return -ENOMEM;
- }
-
ap = dev->priv;
ap->pdev = pdev;
@@ -737,6 +729,12 @@
"AceNIC %i will be disabled.\n",
dev->name, boards_found);
break;
+ }
+
+ if (register_netdev(dev)) {
+ printk(KERN_ERR "acenic: device registration failed\n");
+ kfree(dev);
+ continue;
}
switch(pdev->vendor) {
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: Route cache performance under stress, Florian Weimer |
|---|---|
| Next by Date: | Re: [PATCH 2.5.70] acenic -- update to use alloc_etherdev, Jes Sorensen |
| Previous by Thread: | [PATCH] IPV6: fix payload length of reassembled packet, YOSHIFUJI Hideaki / 吉藤英明 |
| Next by Thread: | Re: [PATCH 2.5.70] acenic -- update to use alloc_etherdev, Jes Sorensen |
| Indexes: | [Date] [Thread] [Top] [All Lists] |