aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHuazhong Tan <tanhuazhong@huawei.com>2019-04-06 15:43:29 +0800
committerDavid S. Miller <davem@davemloft.net>2019-04-08 15:30:49 -0700
commit056cbab332940b53d0841b052ed1cf4abf7307a5 (patch)
treee99535f849b995820df2c85d3b140cba05b9979b /drivers
parentnet: hns3: adjust the timing of hns3_client_stop when unloading (diff)
downloadlinux-dev-056cbab332940b53d0841b052ed1cf4abf7307a5.tar.xz
linux-dev-056cbab332940b53d0841b052ed1cf4abf7307a5.zip
net: hns3: deactive the reset timer when reset successfully
If the reset has been done successfully, the ongoing reset timer is unnecessary. Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com> Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 693dfdda7537..2683399a0745 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3022,6 +3022,7 @@ static void hclge_reset(struct hclge_dev *hdev)
hdev->last_reset_time = jiffies;
hdev->reset_fail_cnt = 0;
ae_dev->reset_type = HNAE3_NONE_RESET;
+ del_timer(&hdev->reset_timer);
return;