From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sun, 18 Nov 2007 21:04:05 +0000 (+0100)
Subject: sis190: remove needless MII reset
X-Git-Tag: v2.6.26-rc1~104^2~45^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c34ebbae01e3d1f6a5cced6a40dc0ed792590d22;p=linux-2.6

sis190: remove needless MII reset

It does not help the auto-negotiation process to settle.

Added a debug message to give some hindsight when things
do not work as expected.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 0b22e75633..20f48296ef 100644
--- a/drivers/net/sis190.c
+++ b/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 ! */