From: Quinn Tran <qutran@xxxxxxxxxxx> commit f3502e2e98a92981601edc3dadf4b0f43c79836b upstream. Remove stale recovery code that prevents normal path recovery. Link: https://lore.kernel.org/r/20220310092604.22950-11-njavali@xxxxxxxxxxx Fixes: 1cbc0efcd9be ("scsi: qla2xxx: Fix retry for PRLI RJT with reason of BUSY") Cc: stable@xxxxxxxxxxxxxxx Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx> Signed-off-by: Quinn Tran <qutran@xxxxxxxxxxx> Signed-off-by: Nilesh Javali <njavali@xxxxxxxxxxx> Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/scsi/qla2xxx/qla_init.c | 7 ------- 1 file changed, 7 deletions(-) --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -2085,13 +2085,6 @@ qla24xx_handle_prli_done_event(struct sc qla24xx_post_gpdb_work(vha, ea->fcport, 0); break; default: - if ((ea->iop[0] == LSC_SCODE_ELS_REJECT) && - (ea->iop[1] == 0x50000)) { /* reson 5=busy expl:0x0 */ - set_bit(RELOGIN_NEEDED, &vha->dpc_flags); - ea->fcport->fw_login_state = DSC_LS_PLOGI_COMP; - break; - } - sp = ea->sp; ql_dbg(ql_dbg_disc, vha, 0x2118, "%s %d %8phC priority %s, fc4type %x prev try %s\n", Patches currently in stable-queue which might be from qutran@xxxxxxxxxxx are queue-5.15/scsi-qla2xxx-fix-hang-due-to-session-stuck.patch queue-5.15/scsi-qla2xxx-fix-disk-failure-to-rediscover.patch queue-5.15/scsi-qla2xxx-fix-scheduling-while-atomic.patch queue-5.15/scsi-qla2xxx-fix-stuck-session-in-gpdb.patch queue-5.15/scsi-qla2xxx-fix-premature-hw-access-after-pci-error.patch queue-5.15/scsi-qla2xxx-fix-n2n-inconsistent-plogi.patch queue-5.15/scsi-qla2xxx-fix-warning-message-due-to-adisc-being-flushed.patch queue-5.15/scsi-qla2xxx-fix-stuck-session-of-prli-reject.patch queue-5.15/scsi-qla2xxx-edif-fix-clang-warning.patch queue-5.15/scsi-qla2xxx-reduce-false-trigger-to-login.patch queue-5.15/scsi-qla2xxx-fix-incorrect-reporting-of-task-management-failure.patch
