From 8e039ec1f08d4fc1db130176b485d65ae719251b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 8 Jul 2020 14:21:16 +0000 Subject: [PATCH] qla2x00t*: Port to Linux kernel v5.7 (merge r8863:8865 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.4.x@9045 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_nvme.c | 8 ++++++++ qla2x00t/qla_os.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c index 4bfb41e28..110dbc09f 100644 --- a/qla2x00t-32gbit/qla_nvme.c +++ b/qla2x00t-32gbit/qla_nvme.c @@ -621,6 +621,14 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) } static struct nvme_fc_port_template qla_nvme_fc_transport = { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0) + /* + * See also commit 863fbae929c7 ("nvme_fc: add module to ops template + * to allow module references"). + */ + .module = THIS_MODULE, +#endif .localport_delete = qla_nvme_localport_delete, .remoteport_delete = qla_nvme_remoteport_delete, .create_queue = qla_nvme_alloc_queue, diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c index 20bb988a1..44a051c23 100644 --- a/qla2x00t/qla_os.c +++ b/qla2x00t/qla_os.c @@ -4775,7 +4775,9 @@ qla2xxx_pci_resume(struct pci_dev *pdev) "The device failed to resume I/O from slot/link_reset.\n"); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0) pci_cleanup_aer_uncorrect_error_status(pdev); +#endif ha->flags.eeh_busy = 0; }