linux-2.1.90 PATCH: drivers/net/smc-mca.c does not compile

Adam J. Richter (adam@yggdrasil.com)
Wed, 18 Mar 1998 12:00:39 -0800

In Linux 2.1.90, the file drivers/net/smc-mca.c has a
few instances where MAX_ULTRA_CARDS was used where MAX_ULTRAMCA_CARDS
was supposed to be used or where ultra_probe was used where ultramca_probe.
As a result, smc-mca.c failed to compile. The attached patch fixes
these problems.

This bug would have been caught before release if the patch for
the GNU style "./confgiure" configuration method that I submitted both to
linux-kernel@vger.rutgers.edu and to Linus had been integrated and
used in Linux 2.1.90.

Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 205
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."

-----------------------------CUT HERE--------------------------------------

--- /tmp/linux-2.1.90/drivers/net/smc-mca.c Thu Feb 19 14:58:40 1998
+++ linux/drivers/net/smc-mca.c Wed Mar 18 10:05:40 1998
@@ -306,9 +306,9 @@

#define MAX_ULTRAMCA_CARDS 4 /* Max number of Ultra cards per module */
#define NAMELEN 8 /* # of chars for storing dev->name */
-static char namelist[NAMELEN * MAX_ULTRA_CARDS] = { 0, };
+static char namelist[NAMELEN * MAX_ULTRAMCA_CARDS] = { 0, };

-static struct device dev_ultra[MAX_ULTRA_CARDS] =
+static struct device dev_ultra[MAX_ULTRAMCA_CARDS] =
{
{
NULL, /* assign a chunk of namelist[] below */
@@ -318,11 +318,11 @@
},
};

-static int io[MAX_ULTRA_CARDS] = { 0, };
-static int irq[MAX_ULTRA_CARDS] = { 0, };
+static int io[MAX_ULTRAMCA_CARDS] = { 0, };
+static int irq[MAX_ULTRAMCA_CARDS] = { 0, };

-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_ULTRA_CARDS) "i");
-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_ULTRA_CARDS) "i");
+MODULE_PARM(io, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i");
+MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i");

/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
@@ -331,13 +331,13 @@
{
int this_dev, found = 0;

- for (this_dev = 0; this_dev < MAX_ULTRA_CARDS; this_dev++)
+ for (this_dev = 0; this_dev < MAX_ULTRAMCA_CARDS; this_dev++)
{
struct device *dev = &dev_ultra[this_dev];
dev->name = namelist+(NAMELEN*this_dev);
dev->irq = irq[this_dev];
dev->base_addr = io[this_dev];
- dev->init = ultra_probe;
+ dev->init = ultramca_probe;
if (io[this_dev] == 0)
{
if (this_dev != 0)
@@ -360,7 +360,7 @@
{
int this_dev;

- for (this_dev = 0; this_dev < MAX_ULTRA_CARDS; this_dev++)
+ for (this_dev = 0; this_dev < MAX_ULTRAMCA_CARDS; this_dev++)
{
struct device *dev = &dev_ultra[this_dev];
if (dev->priv != NULL)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu