Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b6c3c9 authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix stalled relogin 



This patch sets and clears FCF_ASYNC_{SENT|ACTIVE} flags to prevent
stalling of relogin attempt. Once flag are correctly set/cleared, relogin
timer can retry relogin attempt for driver to continue login.

Fixes: fa83e658 ("scsi: qla2xxx: ensure async flags are reset correctly")
Cc: stable@vger.kernel.org #4.17
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f6145e86

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ qla2x00_async_adisc_sp_done(void *ptr, int res) 
	    "Async done-%s res %x %8phC\n",

	    sp->name, res, sp->fcport->port_name);



	sp->fcport->flags &= ~FCF_ASYNC_SENT;

	sp->fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);



	memset(&ea, 0, sizeof(ea));

	ea.event = FCME_ADISC_DONE;

drivers/scsi/qla2xxx/qla_iocb.c

+1 −0
Original line number Diff line number Diff line
@@ -2634,6 +2634,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, 
	ql_dbg(ql_dbg_io, vha, 0x3073,

	    "Enter: PLOGI portid=%06x\n", fcport->d_id.b24);



	fcport->flags |= FCF_ASYNC_SENT;

	sp->type = SRB_ELS_DCMD;

	sp->name = "ELS_DCMD";

	sp->fcport = fcport;