2001-03-05 23:14:28

by Greg Louis

[permalink] [raw]
Subject: 3c509 2.4.2-ac12 compilation fails

gcc -D__KERNEL__ -I/usr/src/linux-2.4.2ac12/include -Wall
-Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
-march=i686 -c -o 3c509.o 3c509.c
3c509.c: In function 'el3_probe':
3c509.c:330: structure has no member named 'name'
make[3]: *** [3c509.o] Error 1
make[3]: Leaving directory /usr/src/linux-2.4.2ac12/drivers/net'

This works, though it's not as informative as what was intended:

--- drivers/net/3c509.c~ Mon Mar 5 17:41:37 2001
+++ drivers/net/3c509.c Mon Mar 5 17:52:57 2001
@@ -326,8 +326,8 @@
return -EBUSY;
irq = idev->irq_resource[0].start;
if (el3_debug > 3)
- printk ("ISAPnP reports %s at i/o 0x%x, irq %d\n",
- el3_isapnp_adapters[i].name, ioaddr, irq);
+ printk ("ISAPnP reports %d at i/o 0x%x, irq %d\n",
+ el3_isapnp_adapters[i].card_device, ioaddr, irq);
EL3WINDOW(0);
for (j = 0; j < 3; j++)
el3_isapnp_phys_addr[pnp_cards][j] =


--
| G r e g L o u i s | gpg public key: |
| http://www.bgl.nu/~glouis | finger [email protected] |


Attachments:
(No filename) (1.01 kB)
(No filename) (206.00 B)
Download all attachments

2001-03-05 23:37:46

by Jeff Garzik

[permalink] [raw]
Subject: Re: 3c509 2.4.2-ac12 compilation fails

Greg Louis wrote:
> gcc -D__KERNEL__ -I/usr/src/linux-2.4.2ac12/include -Wall
> -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
> -march=i686 -c -o 3c509.o 3c509.c
> 3c509.c: In function 'el3_probe':
> 3c509.c:330: structure has no member named 'name'

hrm, I wonder if a patch got dropped before I sent it to Alan. It not
only compiles locally, but works on my router at home :)

> --- drivers/net/3c509.c~ Mon Mar 5 17:41:37 2001
> +++ drivers/net/3c509.c Mon Mar 5 17:52:57 2001
> @@ -326,8 +326,8 @@
> return -EBUSY;
> irq = idev->irq_resource[0].start;
> if (el3_debug > 3)
> - printk ("ISAPnP reports %s at i/o 0x%x, irq %d\n",
> - el3_isapnp_adapters[i].name, ioaddr, irq);
> + printk ("ISAPnP reports %d at i/o 0x%x, irq %d\n",
> + el3_isapnp_adapters[i].card_device, ioaddr,

That should be s/name/driver_data/...

/me begins to download and merge ac12...

--
Jeff Garzik | "You see, in this world there's two kinds of
Building 1024 | people, my friend: Those with loaded guns
MandrakeSoft | and those who dig. You dig." --Blondie

2001-03-06 01:43:27

by Alan Cox

[permalink] [raw]
Subject: Re: 3c509 2.4.2-ac12 compilation fails

> /me begins to download and merge ac12...

It built for me too

2001-03-06 03:10:07

by Jeff Garzik

[permalink] [raw]
Subject: [PATCH] Re: 3c509 2.4.2-ac12 compilation fails

Index: drivers/net/3c509.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_4/drivers/net/3c509.c,v
retrieving revision 1.1.1.22.2.1
diff -u -r1.1.1.22.2.1 3c509.c
--- drivers/net/3c509.c 2001/03/05 00:39:14 1.1.1.22.2.1
+++ drivers/net/3c509.c 2001/03/06 03:05:53
@@ -327,7 +327,7 @@
irq = idev->irq_resource[0].start;
if (el3_debug > 3)
printk ("ISAPnP reports %s at i/o 0x%x, irq %d\n",
- el3_isapnp_adapters[i].name, ioaddr, irq);
+ (char*) el3_isapnp_adapters[i].driver_data, ioaddr, irq);
EL3WINDOW(0);
for (j = 0; j < 3; j++)
el3_isapnp_phys_addr[pnp_cards][j] =
Index: drivers/net/3c515.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_4/drivers/net/3c515.c,v
retrieving revision 1.1.1.22.2.1
diff -u -r1.1.1.22.2.1 3c515.c
--- drivers/net/3c515.c 2001/03/05 00:39:14 1.1.1.22.2.1
+++ drivers/net/3c515.c 2001/03/06 03:05:54
@@ -474,7 +474,7 @@
irq = idev->irq_resource[0].start;
if(corkscrew_debug)
printk ("ISAPNP reports %s at i/o 0x%x, irq %d\n",
- corkscrew_isapnp_adapters[i].name,ioaddr, irq);
+ (char*) corkscrew_isapnp_adapters[i].driver_data, ioaddr, irq);

if ((inw(ioaddr + 0x2002) & 0x1f0) != (ioaddr & 0x1f0))
continue;


Attachments:
netfix-2.4.3.2.patch (1.29 kB)