diff options
author | Arun Easi <arun.easi@qlogic.com> | 2010-05-28 18:08:27 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 13:01:26 -0400 |
commit | ba77ef53547883b6be06c0657d5dc1642ad43d0c (patch) | |
tree | baf6312c95c673fcb368cda9c6e5195e07a23166 /drivers/scsi/qla2xxx | |
parent | 0547fb37ca1f8da18e65b7452f99e9784f026be2 (diff) |
[SCSI] qla2xxx: T10 DIF enablement for 81XX
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 1e4cafabba15..2b499c7601ec 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
@@ -1732,7 +1732,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) | |||
1732 | fc_vport_set_state(fc_vport, FC_VPORT_LINKDOWN); | 1732 | fc_vport_set_state(fc_vport, FC_VPORT_LINKDOWN); |
1733 | } | 1733 | } |
1734 | 1734 | ||
1735 | if (IS_QLA25XX(ha) && ql2xenabledif) { | 1735 | if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && ql2xenabledif) { |
1736 | if (ha->fw_attributes & BIT_4) { | 1736 | if (ha->fw_attributes & BIT_4) { |
1737 | vha->flags.difdix_supported = 1; | 1737 | vha->flags.difdix_supported = 1; |
1738 | DEBUG18(qla_printk(KERN_INFO, ha, | 1738 | DEBUG18(qla_printk(KERN_INFO, ha, |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index fa59181bcb02..bc35ecfbc28f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -1677,7 +1677,7 @@ static struct isp_operations qla81xx_isp_ops = { | |||
1677 | .read_optrom = qla25xx_read_optrom_data, | 1677 | .read_optrom = qla25xx_read_optrom_data, |
1678 | .write_optrom = qla24xx_write_optrom_data, | 1678 | .write_optrom = qla24xx_write_optrom_data, |
1679 | .get_flash_version = qla24xx_get_flash_version, | 1679 | .get_flash_version = qla24xx_get_flash_version, |
1680 | .start_scsi = qla24xx_start_scsi, | 1680 | .start_scsi = qla24xx_dif_start_scsi, |
1681 | .abort_isp = qla2x00_abort_isp, | 1681 | .abort_isp = qla2x00_abort_isp, |
1682 | }; | 1682 | }; |
1683 | 1683 | ||
@@ -2274,7 +2274,7 @@ skip_dpc: | |||
2274 | DEBUG2(printk("DEBUG: detect hba %ld at address = %p\n", | 2274 | DEBUG2(printk("DEBUG: detect hba %ld at address = %p\n", |
2275 | base_vha->host_no, ha)); | 2275 | base_vha->host_no, ha)); |
2276 | 2276 | ||
2277 | if (IS_QLA25XX(ha) && ql2xenabledif) { | 2277 | if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && ql2xenabledif) { |
2278 | if (ha->fw_attributes & BIT_4) { | 2278 | if (ha->fw_attributes & BIT_4) { |
2279 | base_vha->flags.difdix_supported = 1; | 2279 | base_vha->flags.difdix_supported = 1; |
2280 | DEBUG18(qla_printk(KERN_INFO, ha, | 2280 | DEBUG18(qla_printk(KERN_INFO, ha, |