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

Commit 7d0dba17 authored Apr 06, 2009 by Andrew Vasquez Committed by James Bottomley May 20, 2009

[SCSI] qla2xxx: Restrict model-name/description device-table usage.



Information present in static table is only valid for pre-ISP25xx
adapters.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent fc3ea9bc

drivers/scsi/qla2xxx/qla_init.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1538,6 +1538,7 @@ qla2x00_set_model_info(scsi_qla_host_t vha, uint8_t model, size_t len,
		char st, en;
		uint16_t index;
		struct qla_hw_data *ha = vha->hw;
		int use_tbl = !IS_QLA25XX(ha) && IS_QLA81XX(ha);

		if (memcmp(model, BINZERO, len) != 0) {
		strncpy(ha->model_number, model, len);
		@@ -1550,14 +1551,16 @@ qla2x00_set_model_info(scsi_qla_host_t vha, uint8_t model, size_t len,
		}

		index = (ha->pdev->subsystem_device & 0xff);
		if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
		if (use_tbl &&
		ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
		index < QLA_MODEL_NAMES)
		strncpy(ha->model_desc,
		qla2x00_model_name[index * 2 + 1],
		sizeof(ha->model_desc) - 1);
		} else {
		index = (ha->pdev->subsystem_device & 0xff);
		if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
		if (use_tbl &&
		ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
		index < QLA_MODEL_NAMES) {
		strcpy(ha->model_number,
		qla2x00_model_name[index * 2]);