projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de7e619
)
Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"
author
Quinn Tran
<qutran@marvell.com>
Thu, 6 Aug 2020 11:10:14 +0000
(
04:10
-0700)
committer
Martin K. Petersen
<martin.petersen@oracle.com>
Tue, 18 Aug 2020 02:43:55 +0000
(22:43 -0400)
FCP T10-PI and NVMe features are independent of each other. This patch
allows both features to co-exist.
This reverts commit
5da05a26b8305a625bc9d537671b981795b46dab
.
Link:
https://lore.kernel.org/r/20200806111014.28434-12-njavali@marvell.com
Fixes:
5da05a26b830
("scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe")
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_os.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/qla2xxx/qla_os.c
b/drivers/scsi/qla2xxx/qla_os.c
index
fda812b
..
8da00ba
100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_os.c
+++ b/
drivers/scsi/qla2xxx/qla_os.c
@@
-2834,10
+2834,6
@@
qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* This may fail but that's ok */
pci_enable_pcie_error_reporting(pdev);
- /* Turn off T10-DIF when FC-NVMe is enabled */
- if (ql2xnvmeenable)
- ql2xenabledif = 0;
-
ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL);
if (!ha) {
ql_log_pci(ql_log_fatal, pdev, 0x0009,