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

This project is archived. Its data is read-only.

Commit f863f603 authored May 15, 2012 by Nigel Kirkland Committed by James Bottomley May 22, 2012

[SCSI] qla2xxx: Fixups for ISP83xx.



Signed-off-by: Nigel Kirkland <nigel.kirkland@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 6f606d24

drivers/scsi/qla2xxx/qla_attr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -585,7 +585,7 @@ qla2x00_sysfs_write_reset(struct file filp, struct kobject kobj,
		scsi_unblock_requests(vha->host);
		break;
		case 0x2025d:
		if (!IS_QLA81XX(ha))
		if (!IS_QLA81XX(ha) \|\| !IS_QLA8031(ha))
		return -EPERM;

		ql_log(ql_log_info, vha, 0x706f,
		@@ -1153,7 +1153,7 @@ qla2x00_phy_version_show(struct device dev, struct device_attribute attr,
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		return snprintf(buf, PAGE_SIZE, "\n");

		return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",

drivers/scsi/qla2xxx/qla_bsg.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -544,7 +544,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t vha, uint16_t config,
		int rval = 0;
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		goto done_set_internal;

		new_config[0] = config[0] \| (ENABLE_INTERNAL_LOOPBACK << 1);
		@@ -586,7 +586,7 @@ qla81xx_reset_internal_loopback(scsi_qla_host_t vha, uint16_t config,
		uint16_t new_config[4];
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
		if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
		goto done_reset_internal;

		memset(new_config, 0 , sizeof(new_config));
		@@ -711,7 +711,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)

		if ((ha->current_topology == ISP_CFG_F \|\|
		(atomic_read(&vha->loop_state) == LOOP_DOWN) \|\|
		((IS_QLA81XX(ha) \|\| IS_QLA83XX(ha)) &&
		((IS_QLA81XX(ha) \|\| IS_QLA8031(ha)) &&
		le32_to_cpu((uint32_t )req_data) == ELS_OPCODE_BYTE
		&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
		elreq.options == EXTERNAL_LOOPBACK) {