From a8711755b5f77c8db36c34a384f8c19ba52d36c1 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 24 Oct 2021 02:37:31 +0000
Subject: [PATCH] fcst: Fix the build against the latest UEK kernel

This patch fixes the build against UEK kernel 5.4.17-2136.300.7.el8uek and
breaks the build for older 5.4.17 UEK kernels, e.g.
5.4.17-2102.200.13.el8uek.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9586 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/ft_cmd.c | 4 +++-
 fcst/ft_io.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index a072fe814..d2dc37e8c 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -19,7 +19,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
+	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) &&	\
+	  defined(UEK_KABI_RENAME))
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>
diff --git a/fcst/ft_io.c b/fcst/ft_io.c
index b1de814d2..c17a6df2d 100644
--- a/fcst/ft_io.c
+++ b/fcst/ft_io.c
@@ -24,7 +24,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
+	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) &&	\
+	  defined(UEK_KABI_RENAME))
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>