From: Huazhong Tan <tanhuazhong@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<linuxarm@huawei.com>, Huazhong Tan <tanhuazhong@huawei.com>,
Yunsheng Lin <linyunsheng@huawei.com>,
Peng Li <lipeng321@huawei.com>
Subject: [PATCH net-next 07/12] net: hns3: remove redundant codes in hclge_knic_setup
Date: Fri, 18 Jan 2019 16:13:09 +0800 [thread overview]
Message-ID: <1547799194-38212-8-git-send-email-tanhuazhong@huawei.com> (raw)
In-Reply-To: <1547799194-38212-1-git-send-email-tanhuazhong@huawei.com>
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>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 17 +----------------
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +-
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index f7637c0..17b1e33 100644
--- 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 fda91e5..8c57950 100644
--- 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;
--
2.7.4
next prev parent reply other threads:[~2019-01-18 8:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 8:13 [PATCH net-next 00/12] net: hns3: code optimizations & bugfixes for HNS3 driver Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 01/12] net: hns3: modify enet reinitialization interface Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 02/12] net: hns3: remove unused member in struct hns3_enet_ring Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 03/12] net: hns3: remove unnecessary hns3_adjust_tqps_num Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 04/12] net: hns3: reuse reinitialization interface in the hns3_set_channels Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 05/12] net: hns3: add interface hclge_tm_bp_setup Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 06/12] net: hns3: modify parameter checks in the hns3_set_channels Huazhong Tan
2019-01-18 8:13 ` Huazhong Tan [this message]
2019-01-18 8:13 ` [PATCH net-next 08/12] net: hns3: fix user configuration loss for ethtool -L Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 09/12] net: hns3: adjust the use of alloc_tqps and num_tqps Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 10/12] net: hns3: fix wrong combined count returned by ethtool -l Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 11/12] net: hns3: do reinitialization while ETS configuration changed Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 12/12] net: hns3: add HNAE3_RESTORE_CLIENT interface in enet module Huazhong Tan
2019-01-18 23:10 ` [PATCH net-next 00/12] net: hns3: code optimizations & bugfixes for HNS3 driver David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1547799194-38212-8-git-send-email-tanhuazhong@huawei.com \
--to=tanhuazhong@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=linyunsheng@huawei.com \
--cc=lipeng321@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).