net: hns3: fix for getting autoneg in hns3_get_link_ksettings

This patch fixes a bug for ethtool's get_link_ksettings().
When phy exists, we should get autoneg from phy rather than from mac.
Because the value of mac.autoneg is invalid when phy exists.

Fixes: 496d03e (net: hns3: Add Ethtool support to HNS3 driver)
Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Lipeng <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
index 5cd163b..367b20c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
@@ -9,6 +9,7 @@
 
 #include <linux/etherdevice.h>
 #include <linux/string.h>
+#include <linux/phy.h>
 
 #include "hns3_enet.h"
 
@@ -571,26 +572,25 @@ static int hns3_get_link_ksettings(struct net_device *netdev,
        u32 advertised_caps;
        u8 media_type = HNAE3_MEDIA_TYPE_UNKNOWN;
        u8 link_stat;
-       u8 auto_neg;
-       u8 duplex;
-       u32 speed;
 
        if (!h->ae_algo || !h->ae_algo->ops)
                return -EOPNOTSUPP;
 
        /* 1.auto_neg & speed & duplex from cmd */
-       if (h->ae_algo->ops->get_ksettings_an_result) {
-               h->ae_algo->ops->get_ksettings_an_result(h, &auto_neg,
-                                                        &speed, &duplex);
-               cmd->base.autoneg = auto_neg;
-               cmd->base.speed = speed;
-               cmd->base.duplex = duplex;
-
-               link_stat = hns3_get_link(netdev);
-               if (!link_stat) {
-                       cmd->base.speed = (u32)SPEED_UNKNOWN;
-                       cmd->base.duplex = DUPLEX_UNKNOWN;
-               }
+       if (netdev->phydev)
+               phy_ethtool_ksettings_get(netdev->phydev, cmd);
+       else if (h->ae_algo->ops->get_ksettings_an_result)
+               h->ae_algo->ops->get_ksettings_an_result(h,
+                                                        &cmd->base.autoneg,
+                                                        &cmd->base.speed,
+                                                        &cmd->base.duplex);
+       else
+               return -EOPNOTSUPP;
+
+       link_stat = hns3_get_link(netdev);
+       if (!link_stat) {
+               cmd->base.speed = SPEED_UNKNOWN;
+               cmd->base.duplex = DUPLEX_UNKNOWN;
        }
 
        /* 2.media_type get from bios parameter block */