PATCH: make pcmcica devices report pcmcia bus info in gdrvinfo

From: Alan Cox (alan@lxorguk.ukuu.org.uk)
Date: Mon Jul 14 2003 - 07:21:21 EST

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/3c574_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/3c574_cs.c
--- linux.22-pre5/drivers/net/pcmcia/3c574_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/3c574_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1202,6 +1202,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "3c574_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/axnet_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/axnet_cs.c
--- linux.22-pre5/drivers/net/pcmcia/axnet_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/axnet_cs.c 2003-06-29 16:09:56.000000000 +0100
@@ -833,6 +833,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "axnet_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/ibmtr_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/ibmtr_cs.c
--- linux.22-pre5/drivers/net/pcmcia/ibmtr_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/ibmtr_cs.c 2003-06-29 16:09:56.000000000 +0100
@@ -177,6 +177,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "ibmtr_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/pcnet_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/pcnet_cs.c
--- linux.22-pre5/drivers/net/pcmcia/pcnet_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/pcnet_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1226,6 +1226,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "pcnet_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/ray_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/ray_cs.c
--- linux.22-pre5/drivers/net/pcmcia/ray_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/ray_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1247,6 +1247,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "ray_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/smc91c92_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/smc91c92_cs.c
--- linux.22-pre5/drivers/net/pcmcia/smc91c92_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/smc91c92_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -2161,6 +2161,7 @@
         struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
         strcpy(info.driver, DRV_NAME);
         strcpy(info.version, DRV_VERSION);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
         if (copy_to_user(useraddr, &info, sizeof(info)))
             return -EFAULT;
         return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/wavelan_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/wavelan_cs.c
--- linux.22-pre5/drivers/net/pcmcia/wavelan_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/wavelan_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1902,6 +1902,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "wavelan_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/xirc2ps_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/xirc2ps_cs.c
--- linux.22-pre5/drivers/net/pcmcia/xirc2ps_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/xirc2ps_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1733,6 +1733,7 @@
         case ETHTOOL_GDRVINFO: {
                 struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                 strncpy(info.driver, "xirc2ps_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
                 if (copy_to_user(useraddr, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
-
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/

This archive was generated by hypermail 2b29 : Tue Jul 15 2003 - 22:00:51 EST