From nobody Mon May 30 20:48:17 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C52A71B46819; Mon, 30 May 2022 20:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBnYY5Bh6z3rDR; Mon, 30 May 2022 20:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653943697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DqRd3kO79H8dKHrXwM+Aosn3Y3lSqZwQSfqXv/fZAk4=; b=NdBbn4BTeuA1hSOkmFE4hG9ZYvsIeRjjyerxlcBT6I6PuVbW/OrRKqapCDUDR50CQQH6jn x1pV51oAjdBz5cnCuBpABn0KV1n73e4/UB7sS0KLbeOEzZAb/aK/yORKYa3uodj/UUT4yD a6U2InrBl1onIaytRSbvz//yH73KwNWKS5YxYTq9pk90VP6G0fWTVAe395S3xjVhlsTlDS ulZg8J9zo7dkr3lBPM/CvafQSzrKxWqnRza1LQrNEqSB2jjqu6dZzYtUqPThTkEZZIvRej bzDLfAx6Xd5oHaA16Te5aJhhuZS3gffjtkk06oLzmuTweq0iuLl1ifqnbmAIqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 924561E67D; Mon, 30 May 2022 20:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24UKmHha064383; Mon, 30 May 2022 20:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UKmHQF064382; Mon, 30 May 2022 20:48:17 GMT (envelope-from git) Date: Mon, 30 May 2022 20:48:17 GMT Message-Id: <202205302048.24UKmHQF064382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: acdfbc6cbe0a - main - irdma: fix LINT-NOIP/NOINET/NOINET6 builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acdfbc6cbe0a8a976d446216be84994c8ee8d5c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653943697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DqRd3kO79H8dKHrXwM+Aosn3Y3lSqZwQSfqXv/fZAk4=; b=kJnXfzc7GatoxftHVlkXZpxDdz7FJah2sZx71BzN/X1k1oU/G3njr6kSIXu/9hY/foRuF8 Hn2OInsa2MwuiHx0poxwDgzak3haa5fCfp+MZ0B23nJfN68FxwcGFcK3q83zGXquW/QglY 3RDfRB3iWrl2x8IcxwgLUkl9aB+TsmPrqNoWx9j4a5A7xfl7k3adzMafZLk1Hbf3EHZJmo P5L0ZlK1dqs0+POkPOHd3KpIHLfbFw5bwRo26HcZiAqFF7G4941zxOanuiD1Xs0uQcSR4o IN+V27j64BePZuze4wCVi13owtQjYQTqrLq+QDkK8L4B5tvGGzGm/vYMSd4Jqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653943697; a=rsa-sha256; cv=none; b=vQn/KLjDXBOXPHYqX0HoSbRP8IjFgmXh4mNAvEWrv5YmHZnuA3f43z3dCHsXenQYpubjJ4 4/rDpyZ/wEcEyiKWsK1JkTBnG3whbEF0rCiU4CanjqqnRfc9jZWV1+hNnT5yvf4WOtPh0I qUqACOoLO1NqNo7ZvxVBmK1bW+OucVHh/fDFk9HywUW/gBC5nkDeAGvmGdQ8VqGnTm/K6y 6h/LrPNw3vVP+KhzjU+xtG21tKtRndlUr76viNGVvv1BoZe4H/48lJp7aGLTgSfu6hs64F +048K8AZihls8hohMjNseDxDjg8r6XxQBHAmWQt+yBjCnPz3E9HDE7ngg5OPrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=acdfbc6cbe0a8a976d446216be84994c8ee8d5c1 commit acdfbc6cbe0a8a976d446216be84994c8ee8d5c1 Author: Mitchell Horne AuthorDate: 2022-05-30 20:47:32 +0000 Commit: Mitchell Horne CommitDate: 2022-05-30 20:47:55 +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 --- 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 0dfb4fd9923f..816b6e521b89 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4715,35 +4715,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/ ${NO_WUNUSED_BUT_SET_VARIABLE}" -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 fa50c793f29b..29a77e07399e 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -577,9 +577,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"