diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:45:42 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:45:42 +0100 |
commit | 98cb621081705e2244ef6c265ff8a9f2208c7e2a (patch) | |
tree | 6205be47a83d54d3e35e049b67973244120f8bd6 /drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | |
parent | b844ff366f06a2bcecfbd053b4d4a472e670dec8 (diff) | |
parent | 9dff0aa95a324e262ffb03f425d00e4751f3294e (diff) | |
download | linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.tar.gz linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.tar.bz2 linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index 8e9b95871d30..ce15d2350db9 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -1157,16 +1157,18 @@ static int hns_get_regs_len(struct net_device *net_dev) */ static int hns_nic_nway_reset(struct net_device *netdev) { - int ret = 0; struct phy_device *phy = netdev->phydev; - if (netif_running(netdev)) { - /* if autoneg is disabled, don't restart auto-negotiation */ - if (phy && phy->autoneg == AUTONEG_ENABLE) - ret = genphy_restart_aneg(phy); - } + if (!netif_running(netdev)) + return 0; - return ret; + if (!phy) + return -EOPNOTSUPP; + + if (phy->autoneg != AUTONEG_ENABLE) + return -EINVAL; + + return genphy_restart_aneg(phy); } static u32 |