net: hns3: fix return value handle issue for hclge_set_loopback()

In current code, it always return 0, even loopback mode setting failed.
It's incorrect. This patch fixes return value handle for loopback test.

Fixes: 0f29fc23b21d ("net: hns3: Fix for loopback selftest failed problem")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index abb78696d7ce31bc32e9cf58f142e77ffb2c756b..ed73f7fc9171ee35f67f7c23d40b94fb1d41d5e9 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -117,7 +117,7 @@ static int hns3_lp_up(struct net_device *ndev, enum hnae3_loop loop_mode)
        ret = hns3_lp_setup(ndev, loop_mode, true);
        usleep_range(10000, 20000);
 
-       return 0;
+       return ret;
 }
 
 static int hns3_lp_down(struct net_device *ndev, enum hnae3_loop loop_mode)
@@ -334,10 +334,10 @@ static void hns3_self_test(struct net_device *ndev,
                        continue;
 
                data[test_index] = hns3_lp_up(ndev, loop_type);
-               if (!data[test_index]) {
+               if (!data[test_index])
                        data[test_index] = hns3_lp_run_test(ndev, loop_type);
-                       hns3_lp_down(ndev, loop_type);
-               }
+
+               hns3_lp_down(ndev, loop_type);
 
                if (data[test_index])
                        eth_test->flags |= ETH_TEST_FL_FAILED;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 64b1589e549f19d0d233eefda1855747deb2a68b..d5482f9c422c4802369e57067d79d02fbf2f6217 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -5332,6 +5332,9 @@ static int hclge_set_loopback(struct hnae3_handle *handle,
                break;
        }
 
+       if (ret)
+               return ret;
+
        kinfo = &vport->nic.kinfo;
        for (i = 0; i < kinfo->num_tqps; i++) {
                ret = hclge_tqp_enable(hdev, i, 0, en);