Commit 918d81fd authored Sep 21, 2018 by Jian Shen Committed by Greg Kroah-Hartman Nov 13, 2018

net: hns3: Fix ets validate issue



[ Upstream commit adefc0a2ff465f4ac4a88450fe69d336c8b074c5 ]

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: cacde272 ("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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 118f36c1

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -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];
		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;