From a641ff67e20a51baf47eba289c52fa7c7ba216ea Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sun, 18 Nov 2007 22:04:05 +0100
Subject: [PATCH] --- yaml --- r: 95351 b: refs/heads/master c:
 c34ebbae01e3d1f6a5cced6a40dc0ed792590d22 h: refs/heads/master i:   95349:
 605d81a20a7680fce44140be0939ccd0b65b7083   95347:
 a74a7440aa8133ce35e63ebaf5358858f5865f63   95343:
 670f82f083a235f46c57ae4e678aba2d989a59cb v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sis190.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1f65ded551fb..742843aecdb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47e4781544aaf2916170ef5516786fbb19447600
+refs/heads/master: c34ebbae01e3d1f6a5cced6a40dc0ed792590d22
diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c
index 0b22e75633a2..20f48296efcb 100644
--- a/trunk/drivers/net/sis190.c
+++ b/trunk/drivers/net/sis190.c
@@ -899,10 +899,9 @@ static void sis190_phy_task(struct work_struct *work)
 		mod_timer(&tp->timer, jiffies + HZ/10);
 	} else if (!(mdio_read_latched(ioaddr, phy_id, MII_BMSR) &
 		     BMSR_ANEGCOMPLETE)) {
-		net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n",
-			 dev->name);
 		netif_carrier_off(dev);
-		mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET);
+		net_link(tp, KERN_WARNING "%s: auto-negotiating...\n",
+			 dev->name);
 		mod_timer(&tp->timer, jiffies + SIS190_PHY_TIMEOUT);
 	} else {
 		/* Rejoice ! */