From c691d068065bd45a358ff0dda6e64e2a19ec44df Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 29 Mar 2019 01:39:36 +0000 Subject: [PATCH] qla2x00t-32gbit: Backport to kernel v4.19 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8101 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_os.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qla2x00t-32gbit/qla_os.c b/qla2x00t-32gbit/qla_os.c index 91f576d74..aa75d3b8b 100644 --- a/qla2x00t-32gbit/qla_os.c +++ b/qla2x00t-32gbit/qla_os.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -7179,12 +7180,19 @@ static int qla2xxx_map_queues(struct Scsi_Host *shost) { int rc; scsi_qla_host_t *vha = (scsi_qla_host_t *)shost->hostdata; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) struct blk_mq_queue_map *qmap = &shost->tag_set.map[0]; if (USER_CTRL_IRQ(vha->hw) || !vha->hw->mqiobase) rc = blk_mq_map_queues(qmap); else rc = blk_mq_pci_map_queues(qmap, vha->hw->pdev, vha->irq_offset); +#else + if (USER_CTRL_IRQ(vha->hw)) + rc = blk_mq_map_queues(&shost->tag_set); + else + rc = blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev, 0); +#endif return rc; }