diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-01-13 11:17:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-20 10:47:20 +0000 |
| commit | 4e28893f5481bc7620a5dacc91b635b84e04ea45 (patch) | |
| tree | a0f409b4756aec17f349dc84375d870fda8d09a4 | |
| parent | 6f935baac23b7a3114fe08828b81d1c22e25c744 (diff) | |
net: phy: hook up clause 45 autonegotiation restart
genphy_restart_aneg() can only restart autonegotiation on clause 22
PHYs. Add a phy_restart_aneg() function which selects between the
clause 22 and clause 45 restart functionality depending on the PHY
type.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/net/phy/phy.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index f72b56abe0fe..cff7107fcafa 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -135,6 +135,24 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts) return 0; } +/** + * phy_restart_aneg - restart auto-negotiation + * @phydev: target phy_device struct + * + * Restart the autonegotiation on @phydev. Returns >= 0 on success or + * negative errno on error. + */ +static int phy_restart_aneg(struct phy_device *phydev) +{ + int ret; + + if (phydev->is_c45) + ret = genphy_c45_restart_aneg(phydev); + else + ret = genphy_restart_aneg(phydev); + + return ret; +} /** * phy_aneg_done - return auto-negotiation status @@ -1427,6 +1445,6 @@ int phy_ethtool_nway_reset(struct net_device *ndev) if (!phydev) return -ENODEV; - return genphy_restart_aneg(phydev); + return phy_restart_aneg(phydev); } EXPORT_SYMBOL(phy_ethtool_nway_reset); |