3c509 2.4.2-ac12 compilation fails

3c509 2.4.2-ac12 compilation fails

[Greg Louis]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

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 greg@bgl.nu |

[-- Attachment #2: Type: application/pgp-signature, Size: 206 bytes --]

Re: 3c509 2.4.2-ac12 compilation fails

[Jeff Garzik]

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

Re: 3c509 2.4.2-ac12 compilation fails

[Alan Cox]

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

It built for me too 

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

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 817 bytes --]

Alan Cox wrote:
> 
> > /me begins to download and merge ac12...
> 
> It built for me too

Found it -- 3c509 bug of a different sort.  You don't notice if
CONFIG_ISAPNP is a module... only if its built into the kernel.  That
code is not conditional on CONFIG_ISAPNP_MODULE, only CONFIG_ISAPNP.

Attached are the compilation fixes -- should apply to 2.4.3-pre2 or
2.4.2-ac12 ok.

The patch does not address the larger issue of CONFIG_ISAPNP versus
CONFIG_ISAPNP_MODULE...  That will have to be visited for several
drivers I think, and its not a 2-second obvious fix like the attached
patch (which needs to be applied anyway).

-- 
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

[-- Attachment #2: netfix-2.4.3.2.patch --]
[-- Type: text/plain, Size: 1322 bytes --]

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;