tulip net driver 2114x phy init fix

diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 7e66f90349a03b5b2ad5b88c90920d7566704a3a..4867ec55da89fe399f252a9010ead175e6b25eea 100644 (file)
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -172,8 +172,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
                        int i;
                        for (i = 0; i < tp->mtable->leafcount; i++)
                                if (tp->mtable->mleaf[i].media == dev->if_port) {
+                                       int startup = ! ((tp->chip_id == DC21143 && tp->revision == 65));
                                        tp->cur_index = i;
-                                       tulip_select_media(dev, 1);
+                                       tulip_select_media(dev, startup);
                                        setup_done = 1;
                                        break;
                                }

diff --git a/drivers/net/tulip/ChangeLog b/drivers/net/tulip/ChangeLog
index c24e03398a03ffc28470b74fdd08592ad9a1b3ad..eac8c9b1602eafde77a8f0be30edded2ff1b5f04 100644 (file)
--- a/drivers/net/tulip/ChangeLog
+++ b/drivers/net/tulip/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-11  Juan Quintela  <quintela@mandrakesoft.com>
+
+       * 21142.c (t21142_lnk_change): Revert earlier patch
+       to always reset phy; only conditionally do so now.
+
 2002-05-03  Jeff Garzik  <jgarzik@mandrakesoft.com>
 
        * tulip_core (tulip_pci_tbl): Add new "comet"

diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index db5591ee0749b6c90120eef014b0a028405c1084..9fd55b20e33571461b7482dc59f45e3fe9583b2c 100644 (file)
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -15,8 +15,8 @@
 */
 
 #define DRV_NAME       "tulip"
-#define DRV_VERSION    "1.1.12"
-#define DRV_RELDATE    "Mar 07, 2002"
+#define DRV_VERSION    "1.1.13"
+#define DRV_RELDATE    "May 11, 2002"
 
 #include <linux/config.h>
 #include <linux/module.h>