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

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

net: hns3: call hns3_nic_set_real_num_queue with netdev down 



hns3_client_setup_tc in enet is for updating TC configuration to
stack, and hclge_setup_tc in hclge_dcb is mainly for setting the
configuration to hardware.

This patch removes the hns3_nic_set_real_num_queue from
hns3_setup_tc in enet, and call hclge_client_setup_tc to update
TC configuration to stack with netdev down, because the netdev
down operation is done in hclge_dcb now.

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 a1ef124e

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

+1 −6
Original line number Diff line number Diff line
@@ -1482,7 +1482,6 @@ static int hns3_setup_tc(struct net_device *netdev, void *type_data) 
	u8 tc = mqprio_qopt->qopt.num_tc;

	u16 mode = mqprio_qopt->mode;

	u8 hw = mqprio_qopt->qopt.hw;

	int ret;



	if (!((hw == TC_MQPRIO_HW_OFFLOAD_TCS &&

	       mode == TC_MQPRIO_MODE_CHANNEL) || (!hw && tc == 0)))
@@ -1494,12 +1493,8 @@ static int hns3_setup_tc(struct net_device *netdev, void *type_data) 
	if (!netdev)

		return -EINVAL;



	ret = (kinfo->dcb_ops && kinfo->dcb_ops->setup_tc) ?

	return (kinfo->dcb_ops && kinfo->dcb_ops->setup_tc) ?

		kinfo->dcb_ops->setup_tc(h, tc, prio_tc) : -EOPNOTSUPP;

	if (ret)

		return ret;



	return hns3_nic_set_real_num_queue(netdev);

}



static int hns3_nic_setup_tc(struct net_device *dev, enum tc_setup_type type,

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

+12 −6
Original line number Diff line number Diff line
@@ -384,13 +384,12 @@ static int hclge_setup_tc(struct hnae3_handle *h, u8 tc, u8 *prio_tc) 
	hclge_tm_prio_tc_info_update(hdev, prio_tc);



	ret = hclge_tm_init_hw(hdev, false);

	if (ret) {

		if (hclge_notify_client(hdev, HNAE3_INIT_CLIENT))

			return ret;

	if (ret)

		goto err_out;



		hclge_notify_client(hdev, HNAE3_UP_CLIENT);

		return ret;

	}

	ret = hclge_client_setup_tc(hdev);

	if (ret)

		goto err_out;



	hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;
@@ -404,6 +403,13 @@ static int hclge_setup_tc(struct hnae3_handle *h, u8 tc, u8 *prio_tc) 
		return ret;



	return hclge_notify_client(hdev, HNAE3_UP_CLIENT);



err_out:

	if (hclge_notify_client(hdev, HNAE3_INIT_CLIENT))

		return ret;



	hclge_notify_client(hdev, HNAE3_UP_CLIENT);

	return ret;

}



static const struct hnae3_dcb_ops hns3_dcb_ops = {