Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ef124e authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files

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: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2a39d98

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);

};

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+1 −9
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c

+5 −4
Original line number Diff line number Diff line
@@ -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,

};