openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sis900: don't restart auto-negotiation each time after link resume. 

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis Kirjanov 2013-08-16 11:20:07 +04:00 committed by David S. Miller
parent 2ff1cf12c9
commit 78f1ccc4f8
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/ethernet/sis/sis900.c
View File

@ -1309,23 +1309,9 @@ static void sis900_timer(unsigned long data)
struct sis900_private *sis_priv = netdev_priv(net_dev); struct sis900_private *sis_priv = netdev_priv(net_dev);
struct mii_phy *mii_phy = sis_priv->mii; struct mii_phy *mii_phy = sis_priv->mii;
static const int next_tick = 5*HZ; static const int next_tick = 5*HZ;
int speed = 0, duplex = 0;
u16 status; u16 status;
if (!sis_priv->autong_complete){
int uninitialized_var(speed), duplex = 0;
sis900_read_mode(net_dev, &speed, &duplex);
if (duplex){
sis900_set_mode(sis_priv, speed, duplex);
sis630_set_eq(net_dev, sis_priv->chipset_rev);
netif_carrier_on(net_dev);
}
sis_priv->timer.expires = jiffies + HZ;
add_timer(&sis_priv->timer);
return;
}
status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS); status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS);
status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS); status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS);
@ -1336,8 +1322,16 @@ static void sis900_timer(unsigned long data)
status = sis900_default_phy(net_dev); status = sis900_default_phy(net_dev);
mii_phy = sis_priv->mii; mii_phy = sis_priv->mii;
if (status & MII_STAT_LINK) if (status & MII_STAT_LINK) {
sis900_check_mode(net_dev, mii_phy); WARN_ON(!(status & MII_STAT_AUTO_DONE));
sis900_read_mode(net_dev, &speed, &duplex);
if (duplex) {
sis900_set_mode(sis_priv, speed, duplex);
sis630_set_eq(net_dev, sis_priv->chipset_rev);
netif_carrier_on(net_dev);
}
}
} else { } else {
/* Link ON -> OFF */ /* Link ON -> OFF */
if (!(status & MII_STAT_LINK)){ if (!(status & MII_STAT_LINK)){