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

Commit aaf4d3e2 authored Apr 25, 2012 by Saurav Kashyap Committed by James Bottomley May 10, 2012

[SCSI] qla2xxx: Properly check for current state after the fabric-login request.



[jejb: checkpatch fixes]
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 4aee5766

drivers/scsi/qla2xxx/qla_os.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -3577,9 +3577,25 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
		continue;
		/* Attempt a retry. */
		status = 1;
		} else
		} else {
		status = qla2x00_fabric_login(vha,
		fcport, &next_loopid);
		if (status == QLA_SUCCESS) {
		int status2;
		uint8_t opts;

		opts = 0;
		if (fcport->flags &
		FCF_FCP2_DEVICE)
		opts \|= BIT_1;
		status2 =
		qla2x00_get_port_database(
		vha, fcport,
		opts);
		if (status2 != QLA_SUCCESS)
		status = 1;
		}
		}
		} else
		status = qla2x00_local_device_login(vha,
		fcport);