未验证 提交 794c1919 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!1683 net: hns3: revert some bugfix and backport some patch

Merge Pull Request from: @svishen 
 
This patch revert some patch and backport some kernel accepted

issue:
https://gitee.com/openeuler/kernel/issues/I7ON9Y 
 
Link:https://gitee.com/openeuler/kernel/pulls/1683 

Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com> 
......@@ -12135,7 +12135,7 @@ static int hclge_set_wol_cfg(struct hclge_dev *hdev,
wol_cfg_cmd = (struct hclge_wol_cfg_cmd *)desc.data;
wol_cfg_cmd->wake_on_lan_mode = cpu_to_le32(wol_info->wol_current_mode);
wol_cfg_cmd->sopass_size = wol_info->wol_sopass_size;
memcpy(&wol_cfg_cmd->sopass, wol_info->wol_sopass, SOPASS_MAX);
memcpy(wol_cfg_cmd->sopass, wol_info->wol_sopass, SOPASS_MAX);
ret = hclge_cmd_send(&hdev->hw, &desc, 1);
if (ret)
......@@ -12801,7 +12801,10 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)
hclge_init_rxd_adv_layout(hdev);
(void)hclge_update_wol(hdev);
ret = hclge_update_wol(hdev);
if (ret)
dev_warn(&pdev->dev,
"failed to update wol config, ret = %d\n", ret);
dev_info(&pdev->dev, "Reset done, %s driver initialization finished.\n",
HCLGE_DRIVER_NAME);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册