From: Huazhong Tan Date: Sat, 6 Apr 2019 07:43:30 +0000 (+0800) Subject: net: hns3: ignore lower-level new coming reset X-Git-Tag: v5.2-rc1~133^2~213^2~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0fdf4d304c24eb2fb99d1f81db5bc46c85f24009;p=users%2Fjedix%2Flinux-maple.git net: hns3: ignore lower-level new coming reset It is unnecessary to deal with the new coming reset if it is lower than the ongoing one. Signed-off-by: Huazhong Tan Signed-off-by: Peng Li Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 2683399a0745..6e8fa2e0b5ea 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -2795,6 +2795,10 @@ static enum hnae3_reset_type hclge_get_reset_level(struct hclge_dev *hdev, clear_bit(HNAE3_FLR_RESET, addr); } + if (hdev->reset_type != HNAE3_NONE_RESET && + rst_level < hdev->reset_type) + return HNAE3_NONE_RESET; + return rst_level; }