qed: Fix VF removal sequence

Orabug: 26783820

After previos changes in HW-stop scheme, VFs stopped sending CLOSE
messages to their PFs when they unload.

Fixes: 1226337ad98f ("qed: Correct HW stop flow")
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ Upstream commit 5f027d7a48aee110e5f66ef5f9e2d90d214cd06b ]
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index d070c1bc8dc6621871fa5e039794cdd9ad3b91e7..8b32419c58c5e71f4d1e5e2f70560d7223d49a45 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -1094,10 +1094,12 @@ static int qed_slowpath_stop(struct qed_dev *cdev)
                qed_free_stream_mem(cdev);
                if (IS_QED_ETH_IF(cdev))
                        qed_sriov_disable(cdev, true);
+       }
+
+       qed_nic_stop(cdev);
 
-               qed_nic_stop(cdev);
+       if (IS_PF(cdev))
                qed_slowpath_irq_free(cdev);
-       }
 
        qed_disable_msix(cdev);