Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Feb 2023 22:46:21 GMT
From:      Eric Joyner <erj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 7333d34e5ec9 - stable/13 - irdma: fix LINT-NOIP/NOINET/NOINET6 builds
Message-ID:  <202302152246.31FMkLV6022095@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by erj:

URL: https://cgit.FreeBSD.org/src/commit/?id=7333d34e5ec96db747648ab7b245d814d3140738

commit 7333d34e5ec96db747648ab7b245d814d3140738
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2022-05-30 20:47:32 +0000
Commit:     Eric Joyner <erj@FreeBSD.org>
CommitDate: 2023-02-15 22:45:43 +0000

    irdma: fix LINT-NOIP/NOINET/NOINET6 builds
    
    This module depends on the presence of both INET and INET6 options in
    order to compile.
    
    Reviewed by:    erj
    Fixes:  cdcd52d41e24 ("irdma: Add RDMA driver for Intel(R) Ethernet...")
    Differential Revision:  https://reviews.freebsd.org/D35343
    
    (cherry picked from commit acdfbc6cbe0a8a976d446216be84994c8ee8d5c1)
---
 sys/conf/files       | 30 +++++++++++++++---------------
 sys/modules/Makefile |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index c15f87d9f830..0c3a553c3dad 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4764,35 +4764,35 @@ ofed/drivers/infiniband/ulp/sdp/sdp_cma.c	optional sdp inet 	\
 ofed/drivers/infiniband/ulp/sdp/sdp_tx.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 
-dev/irdma/icrdma.c		optional irdma ice pci ofed \
+dev/irdma/icrdma.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_cm.c		optional irdma ice pci ofed \
+dev/irdma/irdma_cm.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_ctrl.c		optional irdma ice pci ofed \
+dev/irdma/irdma_ctrl.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_hmc.c		optional irdma ice pci ofed \
+dev/irdma/irdma_hmc.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_hw.c		optional irdma ice pci ofed \
+dev/irdma/irdma_hw.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/icrdma_hw.c		optional irdma ice pci ofed \
+dev/irdma/icrdma_hw.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/fbsd_kcompat.c	optional irdma ice pci ofed \
+dev/irdma/fbsd_kcompat.c	optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_kcompat.c	optional irdma ice pci ofed \
+dev/irdma/irdma_kcompat.c	optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_pble.c		optional irdma ice pci ofed \
+dev/irdma/irdma_pble.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_puda.c		optional irdma ice pci ofed \
+dev/irdma/irdma_puda.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_uda.c		optional irdma ice pci ofed \
+dev/irdma/irdma_uda.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_uk.c		optional irdma ice pci ofed \
+dev/irdma/irdma_uk.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_utils.c		optional irdma ice pci ofed \
+dev/irdma/irdma_utils.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_verbs.c		optional irdma ice pci ofed \
+dev/irdma/irdma_verbs.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
-dev/irdma/irdma_ws.c		optional irdma ice pci ofed \
+dev/irdma/irdma_ws.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 
 dev/mthca/mthca_allocator.c		optional mthca pci ofed \
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 975ca2d84e57..3e2cc835dc99 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -621,9 +621,11 @@ _ice=		ice
 _ice_ddp=	ice_ddp
 .endif
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
+.if ${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no"
 _irdma=		irdma
 .endif
 .endif
+.endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \
 	${MACHINE_CPUARCH} == "riscv"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302152246.31FMkLV6022095>