From 70e055ea0d4cc1243dd30b9e7c6a152eae37a8fb Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 20 Jun 2019 17:09:32 +0000 Subject: [PATCH] scst: Fix a Linux kernel v4.10 warning about redefining FC_PORT_ROLE_NVME_INITIATOR git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8433 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 0d18619a9..7588b5f33 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -1636,7 +1636,11 @@ enum { #define FC_PORT_ROLE_IP_PORT 0x04 #endif -#ifndef FC_PORT_ROLE_NVME_INITIATOR +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +/* + * See also commit d6d20012e116 ("nvme-fabrics: Add FC transport LLDD api + * definitions") # v4.10. + */ #define FC_PORT_ROLE_NVME_INITIATOR 0x10 #define FC_PORT_ROLE_NVME_TARGET 0x20 #define FC_PORT_ROLE_NVME_DISCOVERY 0x40