> On Aug 6, 2020, at 6:10 AM, Nilesh Javali <njavali@xxxxxxxxxxx> wrote:
>
> From: Quinn Tran <qutran@xxxxxxxxxxx>
>
> FCP T10-PI and NVME features are independent of each other. This
> patch allows both features to co-exist.
>
> Fixes: 5da05a26b8305a6 ("scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe")
> Signed-off-by: Quinn Tran <qutran@xxxxxxxxxxx>
> Signed-off-by: Nilesh Javali <njavali@xxxxxxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_os.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index fda812b9b564..8da00ba54aec 100644
> --- 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,
> --
> 2.19.0.rc0
>
Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
--
Himanshu Madhani Oracle Linux Engineering
