Skip to content

Commit dca9323

Browse files
Quinn Tranmartinkpetersen
authored andcommitted
Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"
FCP T10-PI and NVMe features are independent of each other. This patch allows both features to co-exist. This reverts commit 5da05a2. Link: https://lore.kernel.org/r/[email protected] Fixes: 5da05a2 ("scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe") Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent de7e619 commit dca9323

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/scsi/qla2xxx/qla_os.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2834,10 +2834,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
28342834
/* This may fail but that's ok */
28352835
pci_enable_pcie_error_reporting(pdev);
28362836

2837-
/* Turn off T10-DIF when FC-NVMe is enabled */
2838-
if (ql2xnvmeenable)
2839-
ql2xenabledif = 0;
2840-
28412837
ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL);
28422838
if (!ha) {
28432839
ql_log_pci(ql_log_fatal, pdev, 0x0009,

0 commit comments

Comments
 (0)