scsi: qla2xxx: Reduce false trigger to login

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / qla_init.c

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 5dfaa4d..7f5b581 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1644,7 +1644,8 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
            fcport->login_gen, fcport->loop_id, fcport->scan_state,
            fcport->fc4_type);
 
-       if (fcport->scan_state != QLA_FCPORT_FOUND)
+       if (fcport->scan_state != QLA_FCPORT_FOUND ||
+           fcport->disc_state == DSC_DELETE_PEND)
                return 0;
 
        if ((fcport->loop_id != FC_NO_LOOP_ID) &&
@@ -1665,7 +1666,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
        if (vha->host->active_mode == MODE_TARGET && !N2N_TOPO(vha->hw))
                return 0;
 
-       if (fcport->flags & FCF_ASYNC_SENT) {
+       if (fcport->flags & (FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE)) {
                set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
                return 0;
        }