diff mbox series

[15/18] qla2xxx: Remove restriction of FC T10-PI and FC-NVMe

Message ID 20200226224022.24518-16-hmadhani@marvell.com (mailing list archive)
State Accepted
Headers show
Series qla2xxx: fixes for the driver | expand

Commit Message

Himanshu Madhani Feb. 26, 2020, 10:40 p.m. UTC 
From: Quinn Tran <qutran@marvell.com>

T10-PI and FC-NVMe are not mutually exclusive of each
other. This patch removes restrictions where if FC-NVMe
is enabled T10-PI defaults to disabled.

Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
 drivers/scsi/qla2xxx/qla_os.c | 4 ----
 1 file changed, 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 80c5c7b16150..6973fe400ce4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -123,11 +123,7 @@  MODULE_PARM_DESC(ql2xmaxqdepth,
 		"Maximum queue depth to set for each LUN. "
 		"Default is 64.");
 
-#if (IS_ENABLED(CONFIG_NVME_FC))
-int ql2xenabledif;
-#else
 int ql2xenabledif = 2;
-#endif
 module_param(ql2xenabledif, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xenabledif,
 		" Enable T10-CRC-DIF:\n"