blob: 283f716973b7b42a3f7389f7995d2cb33ce292cf [file] [log] [blame]
From 637758874adf40f396545eb73bb57e179582cdb9 Mon Sep 17 00:00:00 2001
From: Roman Bolshakov <>
Date: Mon, 25 Nov 2019 19:57:00 +0300
Subject: [PATCH] scsi: qla2xxx: Don't defer relogin unconditonally
commit dabc5ec915f3a2c657ecfb529cd3d4ec303a4412 upstream.
qla2x00_configure_local_loop sets RELOGIN_NEEDED bit and calls
qla24xx_fcport_handle_login to perform the login. This bit triggers a wake
up of DPC later after a successful login.
The deferred call is not needed if login succeeds, and it's set in
qla24xx_fcport_handle_login in case of errors, hence it should be safe to
Acked-by: Himanshu Madhani <>
Acked-by: Quinn Tran <>
Reviewed-by: Hannes Reinecke <>
Tested-by: Hannes Reinecke <>
Signed-off-by: Roman Bolshakov <>
Signed-off-by: Martin K. Petersen <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index c6715ceae976..fede4a959043 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5090,7 +5090,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
memcpy(&ha->, (void *)ha->init_cb,
- set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
} else {
ql_dbg(ql_dbg_init, vha, 0x00d1,
"PLOGI ELS param read fail.\n");