Commit cf9cca2d authored by qumingguang's avatar qumingguang Committed by David S. Miller

net: hns3: Refactor mac_init function

It needs initialize mdio in initialization process, but reset process
does not reset mdio, so do not initialize mdio in reset process.
This patch move out the mdio configuration function from the mac_init.
So mac_init can be used both in reset process and initialization process.
Signed-off-by: default avatarqumingguang <qumingguang@huawei.com>
Signed-off-by: default avatarLipeng <lipeng321@huawei.com>
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7df7dad6
...@@ -2228,13 +2228,6 @@ static int hclge_mac_init(struct hclge_dev *hdev) ...@@ -2228,13 +2228,6 @@ static int hclge_mac_init(struct hclge_dev *hdev)
mac->link = 0; mac->link = 0;
ret = hclge_mac_mdio_config(hdev);
if (ret) {
dev_warn(&hdev->pdev->dev,
"mdio config fail ret=%d\n", ret);
return ret;
}
/* Initialize the MTA table work mode */ /* Initialize the MTA table work mode */
hdev->accept_mta_mc = true; hdev->accept_mta_mc = true;
hdev->enable_mta = true; hdev->enable_mta = true;
...@@ -4498,6 +4491,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) ...@@ -4498,6 +4491,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
return ret; return ret;
} }
ret = hclge_mac_mdio_config(hdev);
if (ret) {
dev_warn(&hdev->pdev->dev,
"mdio config fail ret=%d\n", ret);
return ret;
}
ret = hclge_mac_init(hdev); ret = hclge_mac_init(hdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Mac init error, ret = %d\n", ret); dev_err(&pdev->dev, "Mac init error, ret = %d\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment