aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/qla2xxx/qla_attr.c4
-rw-r--r--drivers/scsi/qla2xxx/qla_bsg.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index f8d7692851f..5b3b59409a5 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -585,7 +585,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
585 scsi_unblock_requests(vha->host); 585 scsi_unblock_requests(vha->host);
586 break; 586 break;
587 case 0x2025d: 587 case 0x2025d:
588 if (!IS_QLA81XX(ha)) 588 if (!IS_QLA81XX(ha) || !IS_QLA8031(ha))
589 return -EPERM; 589 return -EPERM;
590 590
591 ql_log(ql_log_info, vha, 0x706f, 591 ql_log(ql_log_info, vha, 0x706f,
@@ -1153,7 +1153,7 @@ qla2x00_phy_version_show(struct device *dev, struct device_attribute *attr,
1153 scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); 1153 scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
1154 struct qla_hw_data *ha = vha->hw; 1154 struct qla_hw_data *ha = vha->hw;
1155 1155
1156 if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha)) 1156 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
1157 return snprintf(buf, PAGE_SIZE, "\n"); 1157 return snprintf(buf, PAGE_SIZE, "\n");
1158 1158
1159 return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n", 1159 return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index bc3cc6d9111..26d34cb0986 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -544,7 +544,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
544 int rval = 0; 544 int rval = 0;
545 struct qla_hw_data *ha = vha->hw; 545 struct qla_hw_data *ha = vha->hw;
546 546
547 if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha)) 547 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
548 goto done_set_internal; 548 goto done_set_internal;
549 549
550 new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1); 550 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,
586 uint16_t new_config[4]; 586 uint16_t new_config[4];
587 struct qla_hw_data *ha = vha->hw; 587 struct qla_hw_data *ha = vha->hw;
588 588
589 if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha)) 589 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
590 goto done_reset_internal; 590 goto done_reset_internal;
591 591
592 memset(new_config, 0 , sizeof(new_config)); 592 memset(new_config, 0 , sizeof(new_config));
@@ -711,7 +711,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
711 711
712 if ((ha->current_topology == ISP_CFG_F || 712 if ((ha->current_topology == ISP_CFG_F ||
713 (atomic_read(&vha->loop_state) == LOOP_DOWN) || 713 (atomic_read(&vha->loop_state) == LOOP_DOWN) ||
714 ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) && 714 ((IS_QLA81XX(ha) || IS_QLA8031(ha)) &&
715 le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE 715 le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
716 && req_data_len == MAX_ELS_FRAME_PAYLOAD)) && 716 && req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
717 elreq.options == EXTERNAL_LOOPBACK) { 717 elreq.options == EXTERNAL_LOOPBACK) {