diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-15 23:48:59 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-15 23:48:59 +0300 |
| commit | da07f52d3caf6c24c6dbffb5500f379d819e04bd (patch) | |
| tree | 836e51994554f1aeddeebb6cb6ee568944a467e7 /drivers/net/phy/phy.c | |
| parent | 93d43e58683efd958a0421b932a273df74e0e008 (diff) | |
| parent | f85c1598ddfe83f61d0656bd1d2025fa3b148b99 (diff) | |
| download | linux-da07f52d3caf6c24c6dbffb5500f379d819e04bd.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Move the bpf verifier trace check into the new switch statement in
HEAD.
Resolve the overlapping changes in hinic, where bug fixes overlap
the addition of VF support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 9bdc924eea83..d4bbf79dab6c 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1240,9 +1240,11 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data) /* 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; |