]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: hns3: cleanup mac auto-negotiation state query in hclge_update_speed_duplex
authorFuyun Liang <liangfuyun1@huawei.com>
Wed, 8 Nov 2017 07:52:23 +0000 (15:52 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Nov 2017 06:17:56 +0000 (15:17 +0900)
When checking whether auto-negotiation is on, driver only needs to
check the value of mac.autoneg(SW) directly, and does not need to
query it from hardware. Because this value is always synchronized
with the auto-negotiation state of hardware.

This patch removes mac auto-negotiation state query in
hclge_update_speed_duplex().

Fixes: 46a3df9f9718 (net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support)
Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Lipeng <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index c6ba89089ef33f1f1ad2b280c6887ed72913b0a4..781d5a8cbb6a50fd70f28789cdac7d67b84a1cae 100644 (file)
@@ -2325,18 +2325,7 @@ static int hclge_update_speed_duplex(struct hclge_dev *hdev)
        /* get the speed and duplex as autoneg'result from mac cmd when phy
         * doesn't exit.
         */
-       if (mac.phydev)
-               return 0;
-
-       /* update mac->antoneg. */
-       ret = hclge_query_autoneg_result(hdev);
-       if (ret) {
-               dev_err(&hdev->pdev->dev,
-                       "autoneg result query failed %d\n", ret);
-               return ret;
-       }
-
-       if (!mac.autoneg)
+       if (mac.phydev || !mac.autoneg)
                return 0;
 
        ret = hclge_query_mac_an_speed_dup(hdev, &speed, &duplex);