netdev
[Top] [All Lists]

[e100 2.6 1/3] PRO/10+ not configured properly

To: Jeff Garzik <jgarzik@xxxxxxxxx>
Subject: [e100 2.6 1/3] PRO/10+ not configured properly
From: "Feldman, Scott" <scott.feldman@xxxxxxxxx>
Date: Thu, 25 Sep 2003 18:44:34 -0700 (PDT)
Cc: netdev@xxxxxxxxxxx, "Feldman, Scott" <scott.feldman@xxxxxxxxx>
Reply-to: "Feldman, Scott" <scott.feldman@xxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
* PRO/10+ (10 Mbps-only card) was not configured properly so it didn't 
pass traffic.

-----------------

diff -Naurp net-drivers-2.5/drivers/net/e100/e100_config.c 
net-drivers-2.5/drivers/net/e100.mod/e100_config.c
--- net-drivers-2.5/drivers/net/e100/e100_config.c      2003-09-24 
20:33:44.000000000 -0700
+++ net-drivers-2.5/drivers/net/e100.mod/e100_config.c  2003-09-24 
20:34:04.000000000 -0700
@@ -60,7 +60,7 @@ static const u8 def_config[] = {
  * All other init functions will only set values that are
  * different from the 82557 default.
  */
-static void __devinit
+void __devinit
 e100_config_init_82557(struct e100_private *bdp)
 {
        /* initialize config block */
diff -Naurp net-drivers-2.5/drivers/net/e100/e100_config.h 
net-drivers-2.5/drivers/net/e100.mod/e100_config.h
--- net-drivers-2.5/drivers/net/e100/e100_config.h      2003-09-24 
20:33:44.000000000 -0700
+++ net-drivers-2.5/drivers/net/e100.mod/e100_config.h  2003-09-24 
20:34:09.000000000 -0700
@@ -151,6 +151,7 @@
 
 /* function prototypes */
 extern void e100_config_init(struct e100_private *bdp);
+extern void e100_config_init_82557(struct e100_private *bdp);
 extern unsigned char e100_force_config(struct e100_private *bdp);
 extern unsigned char e100_config(struct e100_private *bdp);
 extern void e100_config_fc(struct e100_private *bdp);
diff -Naurp net-drivers-2.5/drivers/net/e100/e100_main.c 
net-drivers-2.5/drivers/net/e100.mod/e100_main.c
--- net-drivers-2.5/drivers/net/e100/e100_main.c        2003-09-24 
20:33:44.000000000 -0700
+++ net-drivers-2.5/drivers/net/e100.mod/e100_main.c    2003-09-24 
20:34:20.000000000 -0700
@@ -1404,6 +1404,9 @@ e100_hw_init(struct e100_private *bdp)
                bdp->flags |= DF_UCODE_LOADED;
        }
 
+       if ((u8) bdp->rev_id < D101A4_REV_ID)
+               e100_config_init_82557(bdp);
+               
        if (!e100_config(bdp))
                goto err;
 


<Prev in Thread] Current Thread [Next in Thread>