| From: |
| Adam Belay <ambx1@neo.rr.com> |
| To: |
| linux-kernel@vger.kernel.org |
| Subject: |
| [RFC][PATCH] update drivers/net/pcmcia (2/3) |
| Date: |
| Mon, 28 Jun 2004 20:15:04 +0000 |
| Cc: |
| rmk@arm.linux.org.uk, linux@dominikbrodowski.de, akpm@osdl.org,
rml@ximian.com, greg@kroah.com |
Hi,
This patch is needed for class devices to bind to physical devices detected in
drivers/net/pcmcia.
Thanks,
Adam
diff -urw a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
--- a/drivers/net/pcmcia/3c574_cs.c 2004-05-10 02:32:26.000000000 +0000
+++ b/drivers/net/pcmcia/3c574_cs.c 2004-06-24 14:16:47.000000000 +0000
@@ -518,6 +518,7 @@
link->state &= ~DEV_CONFIG_PENDING;
link->dev = &lp->node;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
if (register_netdev(dev) != 0) {
printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n");
diff -urw a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
--- a/drivers/net/pcmcia/3c589_cs.c 2004-05-10 02:33:20.000000000 +0000
+++ b/drivers/net/pcmcia/3c589_cs.c 2004-06-24 14:17:36.000000000 +0000
@@ -390,6 +390,7 @@
link->dev = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
if (register_netdev(dev) != 0) {
printk(KERN_ERR "3c589_cs: register_netdev() failed\n");
diff -urw a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
--- a/drivers/net/pcmcia/axnet_cs.c 2004-05-10 02:32:38.000000000 +0000
+++ b/drivers/net/pcmcia/axnet_cs.c 2004-06-24 14:18:09.000000000 +0000
@@ -457,6 +457,7 @@
info->phy_id = (i < 32) ? i : -1;
link->dev = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
if (register_netdev(dev) != 0) {
printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n");
diff -urw a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
--- a/drivers/net/pcmcia/com20020_cs.c 2004-05-10 02:32:29.000000000 +0000
+++ b/drivers/net/pcmcia/com20020_cs.c 2004-06-24 14:19:22.000000000 +0000
@@ -396,6 +396,7 @@
link->dev = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
i = com20020_found(dev, 0); /* calls register_netdev */
diff -urw a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
--- a/drivers/net/pcmcia/fmvj18x_cs.c 2004-05-10 02:32:53.000000000 +0000
+++ b/drivers/net/pcmcia/fmvj18x_cs.c 2004-06-24 14:19:52.000000000 +0000
@@ -590,6 +590,7 @@
lp->cardtype = cardtype;
link->dev = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
if (register_netdev(dev) != 0) {
printk(KERN_NOTICE "fmvj18x_cs: register_netdev() failed\n");
diff -urw a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
--- a/drivers/net/pcmcia/ibmtr_cs.c 2004-05-10 02:32:37.000000000 +0000
+++ b/drivers/net/pcmcia/ibmtr_cs.c 2004-06-24 14:21:33.000000000 +0000
@@ -366,6 +366,7 @@
link->dev = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
i = ibmtr_probe_card(dev);
if (i != 0) {
diff -urw a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
--- a/drivers/net/pcmcia/nmclan_cs.c 2004-05-10 02:32:00.000000000 +0000
+++ b/drivers/net/pcmcia/nmclan_cs.c 2004-06-24 14:22:21.000000000 +0000
@@ -774,6 +774,7 @@
link->dev = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
i = register_netdev(dev);
if (i != 0) {
diff -urw a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
--- a/drivers/net/pcmcia/pcnet_cs.c 2004-05-10 02:33:13.000000000 +0000
+++ b/drivers/net/pcmcia/pcnet_cs.c 2004-06-24 14:25:38.000000000 +0000
@@ -721,6 +721,7 @@
link->dev = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = ei_poll;
diff -urw a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
--- a/drivers/net/pcmcia/smc91c92_cs.c 2004-05-10 02:32:53.000000000 +0000
+++ b/drivers/net/pcmcia/smc91c92_cs.c 2004-06-24 14:27:25.000000000 +0000
@@ -1021,6 +1021,7 @@
link->dev = &smc->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
if (register_netdev(dev) != 0) {
printk(KERN_ERR "smc91c92_cs: register_netdev() failed\n");
diff -urw a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
--- a/drivers/net/pcmcia/xirc2ps_cs.c 2004-05-10 02:32:28.000000000 +0000
+++ b/drivers/net/pcmcia/xirc2ps_cs.c 2004-06-24 14:29:03.000000000 +0000
@@ -1120,6 +1120,7 @@
link->dev = &local->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
if ((err=register_netdev(dev))) {
printk(KNOT_XIRC "register_netdev() failed\n");
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
