lkml.org 
[lkml]   [2020]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 083/114] net: phy: fix aneg restart in phy_ethtool_set_eee
    Date
    From: Heiner Kallweit <hkallweit1@gmail.com>

    [ Upstream commit 9de5d235b60a7cdfcdd5461e70c5663e713fde87 ]

    phy_restart_aneg() enables aneg in the PHY. That's not what we want
    if phydev->autoneg is disabled. In this case still update EEE
    advertisement register, but don't enable aneg and don't trigger an
    aneg restart.

    Fixes: f75abeb8338e ("net: phy: restart phy autonegotiation after EEE advertisment change")
    Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/phy/phy.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/net/phy/phy.c
    +++ b/drivers/net/phy/phy.c
    @@ -1257,9 +1257,11 @@ int phy_ethtool_set_eee(struct phy_devic
    /* Restart autonegotiation so the new modes get sent to the
    * link partner.
    */
    - ret = phy_restart_aneg(phydev);
    - if (ret < 0)
    - return ret;
    + if (phydev->autoneg == AUTONEG_ENABLE) {
    + ret = phy_restart_aneg(phydev);
    + if (ret < 0)
    + return ret;
    + }
    }

    return 0;

    \
     
     \ /
      Last update: 2020-05-18 19:51    [W:3.748 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site