From c081f0f982b8ca1644023b659787f2f808ac4f45 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 25 Sep 2019 15:22:49 +0000
Subject: [PATCH 1/2] qla2x00t-32gbit: Fix the build against kernel versions
 before v4.10

Fixes: 849adf540b62 ("qla2x00t-32gbit: Backport to kernel v4.9"; r8105)
Reported-by: Andri L. Vicko <andri_vicko@outlook.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8589 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_nvme.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c
index 9b65e26d3..5cf2cf3bd 100644
--- a/qla2x00t-32gbit/qla_nvme.c
+++ b/qla2x00t-32gbit/qla_nvme.c
@@ -726,4 +726,10 @@ int qla_nvme_register_hba(struct scsi_qla_host *vha)
 	return ret;
 }
 
+#else
+
+void qla_nvme_unregister_remote_port(struct fc_port *fcport)
+{
+}
+
 #endif

From 8b67ce61c65a0141ec4888b3fbcf0fc09bf52d47 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 25 Sep 2019 15:30:33 +0000
Subject: [PATCH 2/2] qla2x00t-32gbit: Fix a compiler warning introduced by the
 previous commit

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8590 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_nvme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c
index 5cf2cf3bd..4bfb41e28 100644
--- a/qla2x00t-32gbit/qla_nvme.c
+++ b/qla2x00t-32gbit/qla_nvme.c
@@ -6,10 +6,10 @@
  */
 
 #include <linux/version.h>
+#include "qla_nvme.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
 
-#include "qla_nvme.h"
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
 #include <linux/nvme.h>