[SCSI] qla2xxx: Perform implicit logout during rport tear-down.

During rport tear-down, make sure we do an implicit LOGO of the fcport in our
firmware to try to clear any residual commands associated with that fcport.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 5433f95f3edd..e21db2f78224 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1647,10 +1647,14 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
          * final cleanup of firmware resources (PCBs and XCBs).
          */
         if (fcport->loop_id != FC_NO_LOOP_ID &&
-            !test_bit(UNLOADING, &fcport->vha->dpc_flags))
-                fcport->vha->hw->isp_ops->fabric_logout(fcport->vha,
-                        fcport->loop_id, fcport->d_id.b.domain,
-                        fcport->d_id.b.area, fcport->d_id.b.al_pa);
+            !test_bit(UNLOADING, &fcport->vha->dpc_flags)) {
+                if (IS_FWI2_CAPABLE(fcport->vha->hw))
+                        fcport->vha->hw->isp_ops->fabric_logout(fcport->vha,
+                            fcport->loop_id, fcport->d_id.b.domain,
+                            fcport->d_id.b.area, fcport->d_id.b.al_pa);
+                else
+                        qla2x00_port_logout(fcport->vha, fcport);
+        }
 }
 
 static int