Revert "UBUNTU: SAUCE: {topost} net: hns3: add vector status check before free vector"

BugLink: https://bugs.launchpad.net/bugs/1787477
This reverts commit 617cb5a2ee5682f413d4e5373956a65f2f9fc182.
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 f099a306230d567dd5746d5b62484762a755b235..e07998cb22fafc94d1073bde9416318bef4695b7 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2612,12 +2612,6 @@ static irqreturn_t hclge_misc_irq_handle(int irq, void *data)
 
 static void hclge_free_vector(struct hclge_dev *hdev, int vector_id)
 {
-       if (hdev->vector_status[vector_id] == HCLGE_INVALID_VPORT) {
-               dev_warn(&hdev->pdev->dev,
-                        "vector(vector_id %d) has been freed.\n", vector_id);
-               return;
-       }
-
        hdev->vector_status[vector_id] = HCLGE_INVALID_VPORT;
        hdev->num_msi_left += 1;
        hdev->num_msi_used -= 1;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index f86ea9fa89217795f13e266c9199da0ef7704f52..b2a40070123e5d32fd64b1356c2657bdaf2228f6 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -335,12 +335,6 @@ static int hclgevf_set_handle_info(struct hclgevf_dev *hdev)
 
 static void hclgevf_free_vector(struct hclgevf_dev *hdev, int vector_id)
 {
-       if (hdev->vector_status[vector_id] == HCLGEVF_INVALID_VPORT) {
-               dev_warn(&hdev->pdev->dev,
-                        "vector(vector_id %d) has been freed.\n", vector_id);
-               return;
-       }
-
        hdev->vector_status[vector_id] = HCLGEVF_INVALID_VPORT;
        hdev->num_msi_left += 1;
        hdev->num_msi_used -= 1;