net: hns3: add error handling in hclge_ieee_setets

Currently hclge_ieee_setets returns error directly when there is
error, which may cause netdev not up problem.

This patch adds some error handling when setting ETS configuration
fails.

Fixes: cacde272dd00 ("net: hns3: Add hclge_dcb module for the support of DCB feature")
Signed-off-by: Yunsheng Lin <linyunsheng@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/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
index 3a4a54ee52041d98535aa3d0c5db9a6bfc21bc4d..90b566e8e454049136f40b377a08987b0b4eb5a8 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
@@ -232,12 +232,13 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets)
 
        ret = hclge_ieee_ets_to_tm_info(hdev, ets);
        if (ret)
-               return ret;
+               goto err_out;
 
        if (map_changed) {
                ret = hclge_client_setup_tc(hdev);
                if (ret)
-                       return ret;
+                       goto err_out;
+
                ret = hclge_notify_client(hdev, HNAE3_INIT_CLIENT);
                if (ret)
                        return ret;
@@ -248,6 +249,16 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets)
        }
 
        return hclge_tm_dwrr_cfg(hdev);
+
+err_out:
+       if (!map_changed)
+               return ret;
+
+       if (hclge_notify_client(hdev, HNAE3_INIT_CLIENT))
+               return ret;
+
+       hclge_notify_client(hdev, HNAE3_UP_CLIENT);
+       return ret;
 }
 
 static int hclge_ieee_getpfc(struct hnae3_handle *h, struct ieee_pfc *pfc)