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

Commit 680d7db8 authored Oct 24, 2008 by Shyam Sundar Committed by James Bottomley Nov 05, 2008

[SCSI] qla2xxx: Do not honour max_vports from firmware for 2G ISPs and below.



For 23XX ISPs, max_vports may return an invalid value.
Do not honour it.

Cc: Stable Tree <stable@kernel.org>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 737faece

drivers/scsi/qla2xxx/qla_init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -964,7 +964,6 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
		&ha->fw_minor_version,
		&ha->fw_subminor_version,
		&ha->fw_attributes, &ha->fw_memory_size);
		qla2x00_resize_request_q(ha);
		ha->flags.npiv_supported = 0;
		if ((IS_QLA24XX(ha) \|\| IS_QLA25XX(ha) \|\|
		IS_QLA84XX(ha)) &&
		@@ -976,6 +975,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
		ha->max_npiv_vports =
		MIN_MULTI_ID_FABRIC - 1;
		}
		qla2x00_resize_request_q(ha);

		if (ql2xallocfwdump)
		qla2x00_alloc_fw_dump(ha);

drivers/scsi/qla2xxx/qla_mbx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1964,7 +1964,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t ha, uint16_t cur_xchg_cnt,
		*cur_iocb_cnt = mcp->mb[7];
		if (orig_iocb_cnt)
		*orig_iocb_cnt = mcp->mb[10];
		if (max_npiv_vports)
		if (ha->flags.npiv_supported && max_npiv_vports)
		*max_npiv_vports = mcp->mb[11];
		}