net: hns3: remove redundant codes in hclge_knic_setup

The TC info will be updated in hclge_tm_vport_tc_info_update(),
so hclge_knic_setup() no need to do it again.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index f7637c08bb3a97019dc2387cb51464cffd63056b..17b1e33b0d4ab46adc2d343db700ec626363e234 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -1096,7 +1096,7 @@ static int hclge_knic_setup(struct hclge_vport *vport,
        struct hnae3_handle *nic = &vport->nic;
        struct hnae3_knic_private_info *kinfo = &nic->kinfo;
        struct hclge_dev *hdev = vport->back;
-       int i, ret;
+       int ret;
 
        kinfo->num_desc = num_desc;
        kinfo->rx_buf_len = hdev->rx_buf_len;
@@ -1105,21 +1105,6 @@ static int hclge_knic_setup(struct hclge_vport *vport,
                = min_t(u16, hdev->rss_size_max, num_tqps / kinfo->num_tc);
        kinfo->num_tqps = kinfo->rss_size * kinfo->num_tc;
 
-       for (i = 0; i < HNAE3_MAX_TC; i++) {
-               if (hdev->hw_tc_map & BIT(i)) {
-                       kinfo->tc_info[i].enable = true;
-                       kinfo->tc_info[i].tqp_offset = i * kinfo->rss_size;
-                       kinfo->tc_info[i].tqp_count = kinfo->rss_size;
-                       kinfo->tc_info[i].tc = i;
-               } else {
-                       /* Set to default queue if TC is disable */
-                       kinfo->tc_info[i].enable = false;
-                       kinfo->tc_info[i].tqp_offset = 0;
-                       kinfo->tc_info[i].tqp_count = 1;
-                       kinfo->tc_info[i].tc = 0;
-               }
-       }
-
        kinfo->tqp = devm_kcalloc(&hdev->pdev->dev, kinfo->num_tqps,
                                  sizeof(struct hnae3_queue *), GFP_KERNEL);
        if (!kinfo->tqp)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
index fda91e536a3997989f497efab33780d1769e2cf6..8c5795013a60952d82871ee7e6a6a55a207082cc 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
@@ -529,7 +529,7 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport)
        vport->dwrr = 100;  /* 100 percent as init */
        vport->alloc_rss_size = kinfo->rss_size;
 
-       for (i = 0; i < kinfo->num_tc; i++) {
+       for (i = 0; i < HNAE3_MAX_TC; i++) {
                if (hdev->hw_tc_map & BIT(i)) {
                        kinfo->tc_info[i].enable = true;
                        kinfo->tc_info[i].tqp_offset = i * kinfo->rss_size;