net: hns3: remove dcb_ops->map_update in hclge_dcb

After doing down/uninit/init/up in hclge_dcb, it is not necessary
to call dcb_ops->map_update in enet, so hclge_map_update can be
called directly in hclge_dcb.

This is for preparing to call hns3_nic_set_real_num_queue with
netdev down when user changes mqprio configuration.

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/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index dc3db45361d397715ccb1879da08407e131322de..585800e634e6ffdd68a8a96dd826a906b0883003 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -477,7 +477,6 @@ struct hnae3_dcb_ops {
        u8   (*getdcbx)(struct hnae3_handle *);
        u8   (*setdcbx)(struct hnae3_handle *, u8);
 
-       int (*map_update)(struct hnae3_handle *);
        int (*setup_tc)(struct hnae3_handle *, u8, u8 *);
 };
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 927a980fc211056384222565c130b2a869e7e32e..0ecaeab2dad455d7267fce7d1f78026bedec406b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -3737,7 +3737,6 @@ static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc)
 {
        struct hnae3_knic_private_info *kinfo = &handle->kinfo;
        struct net_device *ndev = kinfo->netdev;
-       int ret;
 
        if (tc > HNAE3_MAX_TC)
                return -EINVAL;
@@ -3745,14 +3744,7 @@ static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc)
        if (!ndev)
                return -ENODEV;
 
-       ret = (kinfo->dcb_ops && kinfo->dcb_ops->map_update) ?
-               kinfo->dcb_ops->map_update(handle) : -EOPNOTSUPP;
-       if (ret)
-               return ret;
-
-       ret = hns3_nic_set_real_num_queue(ndev);
-
-       return ret;
+       return hns3_nic_set_real_num_queue(ndev);
 }
 
 static int hns3_recover_hw_addr(struct net_device *ndev)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
index 6c387b21f882622bb705b4cbb03b6c2bc9894ba9..de8e38cca5071987c237169274206ca959ce67dc 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
@@ -156,10 +156,8 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets,
        return 0;
 }
 
-static int hclge_map_update(struct hnae3_handle *h)
+static int hclge_map_update(struct hclge_dev *hdev)
 {
-       struct hclge_vport *vport = hclge_get_vport(h);
-       struct hclge_dev *hdev = vport->back;
        int ret;
 
        ret = hclge_tm_schd_setup_hw(hdev);
@@ -235,6 +233,10 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets)
                goto err_out;
 
        if (map_changed) {
+               ret = hclge_map_update(hdev);
+               if (ret)
+                       goto err_out;
+
                ret = hclge_client_setup_tc(hdev);
                if (ret)
                        goto err_out;
@@ -411,7 +413,6 @@ static const struct hnae3_dcb_ops hns3_dcb_ops = {
        .ieee_setpfc    = hclge_ieee_setpfc,
        .getdcbx        = hclge_getdcbx,
        .setdcbx        = hclge_setdcbx,
-       .map_update     = hclge_map_update,
        .setup_tc       = hclge_setup_tc,
 };