PATCH: eepro100 oops on 2.4.20

PATCH: eepro100 oops on 2.4.20

[Nicholas Henke]

Below is the patch that fixes an oops on 2.4.20 when insmod'ing eepro100.
 Looks like a trivial 'oops forgot to replace those' case.

---------------------start patch----------------------------------
diff -urN clean/drivers/net/eepro100.c linux-2.4/drivers/net/eepro100.c
--- clean/drivers/net/eepro100.c	Thu Apr  3 23:21:47 2003
+++ linux-2.4/drivers/net/eepro100.c	Thu Apr  3 23:25:09 2003
@@ -788,10 +788,10 @@
 					   ((option & 0x20) ? 0x2000 : 0) | 	/* 100mbps? */
 					   ((option & 0x10) ? 0x0100 : 0)); /* Full duplex? */
 		} else {
-			int mii_bmcrctrl = mdio_read(ioaddr, eeprom[6] & 0x1f, 0);
+			int mii_bmcrctrl = mdio_read(dev, eeprom[6] & 0x1f, 0);
 			/* Reset out of a transceiver left in 10baseT-fixed mode. */
 			if ((mii_bmcrctrl & 0x3100) == 0)
-				mdio_write(ioaddr, eeprom[6] & 0x1f, 0, 0x8000);
+				mdio_write(dev, eeprom[6] & 0x1f, 0, 0x8000);
 		}
 
 		/* Perform a system self-test. */
------------------end----------------------------------------------------------
Nic

P.S Please cc me on any replies to lkml -- I am not on the list
-- 
Nicholas Henke
Penguin Herder & Linux Cluster System Programmer
Liniac Project - Univ. of Pennsylvania

Re: PATCH: eepro100 oops on 2.4.20

[Jeff Garzik]

Nicholas Henke wrote:
> Below is the patch that fixes an oops on 2.4.20 when insmod'ing eepro100.
>  Looks like a trivial 'oops forgot to replace those' case.


Thanks for the patch.  Looks like it's already fixed in 2.4.21-pre.

	Jeff

Re: PATCH: eepro100 oops on 2.4.20

[James Bourne]

On Thu, 3 Apr 2003, Nicholas Henke wrote:

> Below is the patch that fixes an oops on 2.4.20 when insmod'ing eepro100.
>  Looks like a trivial 'oops forgot to replace those' case.

Hi,
FYI, your patch doesn't work against clean 2.4.20...  Did you take this
against 2.4.20 or against the bk tree?

Thanks and regards
James Bourne


-- 
James Bourne                  | Email:            jbourne@hardrock.org          
Unix Systems Administrator    | WWW:           http://www.hardrock.org
Custom Unix Programming       | Linux:  The choice of a GNU generation
----------------------------------------------------------------------
 "All you need's an occasional kick in the philosophy." Frank Herbert  

Re: PATCH: eepro100 oops on 2.4.20

[Nicholas Henke]

On Fri, 4 Apr 2003 07:42:34 -0700 (MST)
James Bourne <jbourne@hardrock.org> wrote:

> Hi,
> FYI, your patch doesn't work against clean 2.4.20...  Did you take
> this against 2.4.20 or against the bk tree?
> 

A clean tree right from ftp.us.kernel.org. Strange...
Anywhooo, I have been informed that this is fixed in 2.4.21-pre.

Nic
-- 
Nicholas Henke
Penguin Herder & Linux Cluster System Programmer
Liniac Project - Univ. of Pennsylvania