---

yaml --- r: 95351 b: refs/heads/master c: c34ebba h: refs/heads/master i: 95349: 605d81a 95347: a74a744 95343: 670f82f v: v3
git-mirror · Apr 27, 2008 · a641ff6 · a641ff6
1 parent b1303be
commit a641ff6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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 ! */