From: Huazhong Tan tanhuazhong@huawei.com
mainline inclusion from mainline-v5.13-rc1 commit 1c5a2ba67989c01b8aeda81969b7a4a3702c51b5 category: cleanup bugzilla: NA CVE: NA DTS: DTS2021090315802
----------------------------
When enter suspend mode the counter of pf reset will be increased twice, since both hclge_prepare_general() and hclge_prepare_wait() increase this counter. So remove the duplicate counting in hclge_prepare_general().
Signed-off-by: Huazhong Tan tanhuazhong@huawei.com Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Yonglong Liu liuyonglong@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 943339f4bad6..fdf2c88b6336 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -10204,8 +10204,6 @@ static void hclge_reset_prepare_general(struct hnae3_ae_dev *ae_dev,
if (hdev->reset_type == HNAE3_FLR_RESET) hdev->rst_stats.flr_rst_cnt++; - else if (hdev->reset_type == HNAE3_FUNC_RESET) - hdev->rst_stats.pf_rst_cnt++; }
static void hclge_reset_done(struct hnae3_ae_dev *ae_dev)