From: Huazhong Tan Date: Tue, 18 Dec 2018 11:37:52 +0000 (+0800) Subject: net: hns3: remove unnecessary configuration recapture while resetting X-Git-Tag: archive/raspbian/5.2.17-1+rpi1^2^2^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c0a6a34519d8b309910a2f4ec7bce05f8af37f1b;p=linux.git net: hns3: remove unnecessary configuration recapture while resetting When doing reset, it is unnecessary to get the hardware's default configuration again, otherwise, the user's configuration will be overwritten. Fixes: 4ed340ab8f49 ("net: hns3: Add reset process in hclge_main") Signed-off-by: Huazhong Tan Signed-off-by: Peng Li Signed-off-by: David S. Miller Gbp-Pq: Topic bugfix/arm64/huawei-taishan Gbp-Pq: Name 0017-net-hns3-remove-unnecessary-configuration-recapture-.patch --- diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 340baf6a470..1dada183456 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -5812,19 +5812,6 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev) return ret; } - ret = hclge_get_cap(hdev); - if (ret) { - dev_err(&pdev->dev, "get hw capability error, ret = %d.\n", - ret); - return ret; - } - - ret = hclge_configure(hdev); - if (ret) { - dev_err(&pdev->dev, "Configure dev error, ret = %d.\n", ret); - return ret; - } - ret = hclge_map_tqp(hdev); if (ret) { dev_err(&pdev->dev, "Map tqp error, ret = %d.\n", ret);