diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2007-11-18 22:04:05 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2008-04-27 18:13:58 +0200 |
| commit | c34ebbae01e3d1f6a5cced6a40dc0ed792590d22 (patch) | |
| tree | 929cbc082c21bfed4d2fec833e274ea7d9d51544 /drivers/net/sis190.c | |
| parent | 47e4781544aaf2916170ef5516786fbb19447600 (diff) | |
| download | linux-c34ebbae01e3d1f6a5cced6a40dc0ed792590d22.tar.gz linux-c34ebbae01e3d1f6a5cced6a40dc0ed792590d22.tar.bz2 linux-c34ebbae01e3d1f6a5cced6a40dc0ed792590d22.zip | |
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>
Diffstat (limited to 'drivers/net/sis190.c')
| -rw-r--r-- | drivers/net/sis190.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 0b22e75633a2..20f48296efcb 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 ! */ |