Commit adefc0a2 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller

net: hns3: Fix ets validate issue

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: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1589924
...@@ -73,6 +73,7 @@ static int hclge_ieee_getets(struct hnae3_handle *h, struct ieee_ets *ets) ...@@ -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, static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets,
u8 *tc, bool *changed) u8 *tc, bool *changed)
{ {
bool has_ets_tc = false;
u32 total_ets_bw = 0; u32 total_ets_bw = 0;
u8 max_tc = 0; u8 max_tc = 0;
u8 i; u8 i;
...@@ -100,13 +101,14 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets, ...@@ -100,13 +101,14 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets,
*changed = true; *changed = true;
total_ets_bw += ets->tc_tx_bw[i]; total_ets_bw += ets->tc_tx_bw[i];
break; has_ets_tc = true;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
} }
if (total_ets_bw != BW_PERCENT) if (has_ets_tc && total_ets_bw != BW_PERCENT)
return -EINVAL; return -EINVAL;
*tc = max_tc + 1; *tc = max_tc + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment