From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<lipeng321@huawei.com>, <mehta.salil@opnsrc.net>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linuxarm@huawei.com>, Jian Shen <shenjian15@huawei.com>
Subject: [PATCH net-next 01/12] net: hns3: Fix ets validate issue
Date: Fri, 21 Sep 2018 16:41:37 +0100 [thread overview]
Message-ID: <20180921154148.26756-2-salil.mehta@huawei.com> (raw)
In-Reply-To: <20180921154148.26756-1-salil.mehta@huawei.com>
From: Jian Shen <shenjian15@huawei.com>
There is a defect in hclge_ets_validate(). If each member of tc_tsa is
not IEEE_8021QAZ_TSA_ETS, the variable total_ets_bw won't be updated.
In this case, the check for value of total_ets_bw will fail. This patch
fixes it by checking total_ets_bw only after it has been updated.
Fixes: cacde272dd00 ("net: hns3: Add hclge_dcb module for the support of DCB feature")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
index f08ebb7..92f1938 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
@@ -73,6 +73,7 @@ static int hclge_ieee_getets(struct hnae3_handle *h, struct ieee_ets *ets)
static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets,
u8 *tc, bool *changed)
{
+ bool has_ets_tc = false;
u32 total_ets_bw = 0;
u8 max_tc = 0;
u8 i;
@@ -100,13 +101,14 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets,
*changed = true;
total_ets_bw += ets->tc_tx_bw[i];
- break;
+ has_ets_tc = true;
+ break;
default:
return -EINVAL;
}
}
- if (total_ets_bw != BW_PERCENT)
+ if (has_ets_tc && total_ets_bw != BW_PERCENT)
return -EINVAL;
*tc = max_tc + 1;
--
2.7.4
next prev parent reply other threads:[~2018-09-21 15:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 15:41 [PATCH net-next 00/12] Bug fixes, snall modifications & cleanup for HNS3 driver Salil Mehta
2018-09-21 15:41 ` Salil Mehta [this message]
2018-09-21 15:41 ` [PATCH net-next 02/12] net: hns3: Unify the type convert for desc.data Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 03/12] net: hns3: Adjust prefix of tx/rx statistic names Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 04/12] net: hns3: Fix tqp array traversal condition for vf Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 05/12] net: hns3: Unify the prefix of vf functions Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 06/12] net: hns3: Add handle for default case Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 07/12] net: hns3: Add nic state check before calling netif_tx_wake_queue Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 08/12] net: hns3: Add unlikely for dma_mapping_error check Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 09/12] net: hns3: Remove print messages for error packet Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 10/12] net: hns3: Add get_media_type ops support for VF Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 11/12] net: hns3: Fix speed/duplex information loss problem when executing ethtool ethx cmd of VF Salil Mehta
2018-09-21 15:41 ` [PATCH net-next 12/12] net: hns3: Remove redundant hclge_get_port_type() Salil Mehta
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=20180921154148.26756-2-salil.mehta@huawei.com \
--to=salil.mehta@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=lipeng321@huawei.com \
--cc=mehta.salil@opnsrc.net \
--cc=netdev@vger.kernel.org \
--cc=shenjian15@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).