Commit 36bbe2f4 authored by Ondrej Zary's avatar Ondrej Zary Committed by David S. Miller

tlan: Restart autonegotiation on link loss

When link is lost on a card which uses internal PHY for 10 Mbit speeds,
restart autonegotiation to allow switching between 10 and 100 Mbps speeds.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59be4ad6
...@@ -2720,6 +2720,7 @@ static void tlan_phy_finish_auto_neg(struct net_device *dev) ...@@ -2720,6 +2720,7 @@ static void tlan_phy_finish_auto_neg(struct net_device *dev)
else if (!(mode & 0x0080) && (mode & 0x0040)) else if (!(mode & 0x0080) && (mode & 0x0040))
priv->tlan_full_duplex = true; priv->tlan_full_duplex = true;
/* switch to internal PHY for 10 Mbps */
if ((!(mode & 0x0180)) && if ((!(mode & 0x0180)) &&
(priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) && (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) &&
(priv->phy_num != 0)) { (priv->phy_num != 0)) {
...@@ -2787,6 +2788,21 @@ static void tlan_phy_monitor(unsigned long data) ...@@ -2787,6 +2788,21 @@ static void tlan_phy_monitor(unsigned long data)
dev->name); dev->name);
tlan_dio_write8(dev->base_addr, TLAN_LED_REG, 0); tlan_dio_write8(dev->base_addr, TLAN_LED_REG, 0);
netif_carrier_off(dev); netif_carrier_off(dev);
if (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) {
/* power down internal PHY */
u16 data = MII_GC_PDOWN | MII_GC_LOOPBK |
MII_GC_ISOLATE;
tlan_mii_sync(dev->base_addr);
tlan_mii_write_reg(dev, priv->phy[0],
MII_GEN_CTL, data);
/* set to external PHY */
priv->phy_num = 1;
/* restart autonegotiation */
tlan_set_timer(dev, 4 * HZ / 10,
TLAN_TIMER_PHY_PDOWN);
return;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment