Re: ISAPNP BUG: 2.4.65 ne2000 driver w. isapnp not working

["M.H.VanLeeuwen" <vanl@megsinet.net>]

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

> Hello.
> 
> Have some trouble with loading modules (see earlier message).
> Tried to compile a driver in.
> 
> dmesg:
> -------
> isapnp: Scanning for PnP cards...
> isapnp: Card Plug & Play Ethernet card
> isapnp: 1 Plug and Play card detected total
> ------
> 
> - no further references do isapnp in logs
> 
> - Same card works (with pnp disabled (jumper) and driver compiled
> as a module) by modprobing it with io=0x300
> 
> - Same card works with 2.4.21-pre5 driver as module both with pnp
> and modual probing
> 
>         Regards
>         Michael
> -

Michael,

NE2k ISAPNP broke around 2.5.64, again.  There are 2 parts to the attached
patch, one to move the NIC initialization earlier in the boot sequence
and the second is a HACK to get ne2k to work when compiled into the
kernel, I've never tried NE2k as a module...

1. The level of isapnp_init was moved to after apci.  Since it is now
   after net_dev_init, ISA PNP NICs fail to initialized at boot.

   This fix allows ISA PNP NIC cards to work during net_dev_init, and still
   leaves isapnp_init after apci_init.

2. The second piece kills off a now ?unnecessary? probe.

Works for me,
Martin

[-- Attachment #2: 65.2k.diff --]
[-- Type: text/plain, Size: 670 bytes --]

--- ./drivers/net/ne.c	Tue Mar  4 22:44:58 2003
+++ ../linux-2.5.65/./drivers/net/ne.c	Tue Mar  4 22:41:36 2003
@@ -176,8 +176,10 @@
 		return -ENXIO;
 
 	/* Then look for any installed ISAPnP clones */
+/*  HACK to kill this probe, also done now by new isapnp code
 	if (isapnp_present() && (ne_probe_isapnp(dev) == 0))
 		return 0;
+*/
 
 #ifndef MODULE
 	/* Last resort. The semi-risky ISA auto-probe. */
--- ./drivers/pnp/isapnp/core.c	Tue Mar 18 05:43:40 2003
+++ ../linux-2.5.65/./drivers/pnp/isapnp/core.c	Tue Mar 18 05:43:14 2003
@@ -1173,7 +1173,7 @@
 	return 0;
 }
 
-device_initcall(isapnp_init);
+subsys_initcall(isapnp_init);
 
 /* format is: noisapnp */