47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 341487a9b370af5c2566fb0c3fe5384c96bdbda7 Mon Sep 17 00:00:00 2001
|
|
From: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Date: Tue, 18 Dec 2018 19:37:52 +0800
|
|
Subject: [PATCH 17/31] net: hns3: remove unnecessary configuration recapture
|
|
while resetting
|
|
Origin: https://git.kernel.org/linus/b51c366df70da0100193d13975980f1990a2d47b
|
|
|
|
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 <tanhuazhong@huawei.com>
|
|
Signed-off-by: Peng Li <lipeng321@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 -------------
|
|
1 file changed, 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 340baf6a470c..1dada183456c 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);
|
|
--
|
|
2.20.1
|
|
|