Revert "UBUNTU: SAUCE: {topost} net: hns3: Add calling roce callback function when...

BugLink: https://bugs.launchpad.net/bugs/1810457
This reverts commit 15a506655c41806bbe61e74afc03d589df242cc9.

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index b5c819f5aff1f4399c360c530fbaf50ea81f4349..b458bb8070b10031e154dc8e2fcb695192971564 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2378,7 +2378,6 @@ static int hclge_get_mac_phy_link(struct hclge_dev *hdev)
 
 static void hclge_update_link_status(struct hclge_dev *hdev)
 {
-       struct hnae3_client *rclient = hdev->roce_client;
        struct hnae3_client *client = hdev->nic_client;
        struct hnae3_handle *handle;
        int state;
@@ -2391,8 +2390,6 @@ static void hclge_update_link_status(struct hclge_dev *hdev)
                for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {
                        handle = &hdev->vport[i].nic;
                        client->ops->link_status_change(handle, state);
-                       if (rclient && rclient->ops->link_status_change)
-                               rclient->ops->link_status_change(handle, state);
                }
                hdev->hw.mac.link = state;
        }

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 33f59bc7b297bfd13789bca048a46a8cb7511917..9c0091f2addfcff7bd565963c43003b210c3d571 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -295,16 +295,12 @@ static void hclgevf_request_link_info(struct hclgevf_dev *hdev)
 void hclgevf_update_link_status(struct hclgevf_dev *hdev, int link_state)
 {
        struct hnae3_handle *handle = &hdev->nic;
-       struct hnae3_client *rclient;
        struct hnae3_client *client;
 
        client = handle->client;
-       rclient = hdev->roce_client;
 
        if (link_state != hdev->hw.mac.link) {
                client->ops->link_status_change(handle, !!link_state);
-               if (rclient && rclient->ops->link_status_change)
-                       rclient->ops->link_status_change(handle, !!link_state);
                hdev->hw.mac.link = link_state;
        }
 }