diff options
| author | Arun Easi <arun.easi@qlogic.com> | 2012-08-22 14:21:31 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-24 04:10:54 -0400 |
| commit | 9e522cd8f3dd7d19b644fc9cfc372bebde9f0053 (patch) | |
| tree | cf4b8e44ce34c2f206bb3d07b3c75f8959f2f471 /drivers/scsi/qla2xxx/qla_attr.c | |
| parent | cb860bbd6b4b12cb56640fefceeaffb526eb7ac5 (diff) | |
[SCSI] qla2xxx: T10 DIF - ISP83xx changes.
Signed-off-by: Arun Easi <arun.easi@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_attr.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index e2ca6be86244..1c28215f8bed 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
| @@ -1812,7 +1812,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) | |||
| 1812 | 1812 | ||
| 1813 | if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) { | 1813 | if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) { |
| 1814 | if (ha->fw_attributes & BIT_4) { | 1814 | if (ha->fw_attributes & BIT_4) { |
| 1815 | int prot = 0; | 1815 | int prot = 0, guard; |
| 1816 | vha->flags.difdix_supported = 1; | 1816 | vha->flags.difdix_supported = 1; |
| 1817 | ql_dbg(ql_dbg_user, vha, 0x7082, | 1817 | ql_dbg(ql_dbg_user, vha, 0x7082, |
| 1818 | "Registered for DIF/DIX type 1 and 3 protection.\n"); | 1818 | "Registered for DIF/DIX type 1 and 3 protection.\n"); |
| @@ -1825,7 +1825,14 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) | |||
| 1825 | | SHOST_DIX_TYPE1_PROTECTION | 1825 | | SHOST_DIX_TYPE1_PROTECTION |
| 1826 | | SHOST_DIX_TYPE2_PROTECTION | 1826 | | SHOST_DIX_TYPE2_PROTECTION |
| 1827 | | SHOST_DIX_TYPE3_PROTECTION); | 1827 | | SHOST_DIX_TYPE3_PROTECTION); |
| 1828 | scsi_host_set_guard(vha->host, SHOST_DIX_GUARD_CRC); | 1828 | |
| 1829 | guard = SHOST_DIX_GUARD_CRC; | ||
| 1830 | |||
| 1831 | if (IS_PI_IPGUARD_CAPABLE(ha) && | ||
| 1832 | (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha))) | ||
| 1833 | guard |= SHOST_DIX_GUARD_IP; | ||
| 1834 | |||
| 1835 | scsi_host_set_guard(vha->host, guard); | ||
| 1829 | } else | 1836 | } else |
| 1830 | vha->flags.difdix_supported = 0; | 1837 | vha->flags.difdix_supported = 0; |
| 1831 | } | 1838 | } |