From: Anil Gurumurthy <anil.gurumurthy@xxxxxxxxxx>
This patch removes DIX-0 refrence from the source
as its not used anymore and should not be allowed
as supported option.
Signed-off-by: Anil Gurumurthy <anil.gurumurthy@xxxxxxxxxx>
Signed-off-by: Himanshu Madhani <hmadhani@xxxxxxxxxxx>
---
drivers/scsi/qla2xxx/qla_attr.c | 3 +--
drivers/scsi/qla2xxx/qla_def.h | 1 -
drivers/scsi/qla2xxx/qla_os.c | 4 +---
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index de1930cd53fb..becde75d0fbc 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -2942,8 +2942,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
guard = SHOST_DIX_GUARD_CRC;
- if (IS_PI_IPGUARD_CAPABLE(ha) &&
- (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha)))
+ if (IS_PI_IPGUARD_CAPABLE(ha) && ql2xenabledif)
guard |= SHOST_DIX_GUARD_IP;
scsi_host_set_guard(vha->host, guard);
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 22f859bef778..063ba73c7372 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3906,7 +3906,6 @@ struct qla_hw_data {
((ha)->fw_attributes_ext[0] & BIT_0))
#define IS_PI_UNINIT_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))
#define IS_PI_IPGUARD_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))
-#define IS_PI_DIFB_DIX0_CAPABLE(ha) (0)
#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \
IS_QLA28XX(ha))
#define IS_PI_SPLIT_DET_CAPABLE(ha) (IS_PI_SPLIT_DET_CAPABLE_HBA(ha) && \
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 79387ac8936f..7f8b5ab0c4c4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -132,7 +132,6 @@ MODULE_PARM_DESC(ql2xenabledif,
" Enable T10-CRC-DIF:\n"
" Default is 2.\n"
" 0 -- No DIF Support\n"
- " 1 -- Enable DIF for all types\n"
" 2 -- Enable DIF for all types, except Type 0.\n");
#if (IS_ENABLED(CONFIG_NVME_FC))
@@ -3370,8 +3369,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
guard = SHOST_DIX_GUARD_CRC;
- if (IS_PI_IPGUARD_CAPABLE(ha) &&
- (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha)))
+ if (IS_PI_IPGUARD_CAPABLE(ha) && ql2xenabledif)
guard |= SHOST_DIX_GUARD_IP;
if (ql2xprotguard)
--
2.12.0
