diff options
| author |   Yonglong Liu <liuyonglong@huawei.com> | 2019-01-26 17:18:26 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-01-27 23:01:56 -0800 |
| commit | ed29ca8b9592562559c64d027fb5eb126e463e2c (patch) | |
| tree | 88015f55ede7329157ee4565e7683db10ac3559b /drivers/net/ethernet/hisilicon/hns | |
| parent | net: hns: Fix for missing of_node_put() after of_parse_phandle() (diff) | |
| download | linux-dev-ed29ca8b9592562559c64d027fb5eb126e463e2c.tar.xz linux-dev-ed29ca8b9592562559c64d027fb5eb126e463e2c.zip | |
net: hns: Restart autoneg need return failed when autoneg off
The hns driver of earlier devices, when autoneg off, restart autoneg
will return -EINVAL, so make the hns driver for the latest devices
do the same.
Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns')
| -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 |