]> err.no Git - linux-2.6/commitdiff
sis190: remove needless MII reset
authorFrancois Romieu <romieu@fr.zoreil.com>
Sun, 18 Nov 2007 21:04:05 +0000 (22:04 +0100)
committerFrancois Romieu <romieu@fr.zoreil.com>
Sun, 27 Apr 2008 16:13:58 +0000 (18:13 +0200)
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>
drivers/net/sis190.c

index 0b22e75633a29e86b1e2910d0ed95c1b19f589a1..20f48296efcb28f2f83356e1925b6de53e4e44e9 100644 (file)
@@ -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 ! */