]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: hns3: Fix ets validate issue
authorJian Shen <shenjian15@huawei.com>
Fri, 21 Sep 2018 15:41:37 +0000 (16:41 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Sep 2018 02:29:32 +0000 (19:29 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c

index f08ebb7caaaf5e359fe2ba159fde8e873204979d..92f19384e25857ccef5d52f35329951250449057 100644 (file)
@@ -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;