From nobody Tue Oct 04 14:09:22 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 4Mhfhf3qHgz4dx1N; Tue, 4 Oct 2022 14:09:22 +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 4Mhfhf3J1tz3m8n; Tue, 4 Oct 2022 14:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664892562; 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=eSSWsIVIXjPqeTqq5DVbcE2rpAVLoNIGd/vv9Kp1Hx8=; b=GBoiYH9wz9XqBJzTNH09BSBS6+jwlzQnKnwUJaqtBFifG0BGI7jBfM131IEFRyAk64o3V+ 2qTeCzR3l9szXCwC449LcOzLbHHu5IrjdHFhOuosD7N6WQIwVhWZpP6FZBIPA3palfaelQ qSgjkEvd6n5tXrOwPfWJOF4k9+A/EhASnKuHUyGvZ9PyfKcUHGymnua/WImnSP2PuIOSFb RslN/0A1obYdO9CXbNBPzR2BeWwBQKqt3x1kB6YLeykWSPNzRZZWREsCXYBVA4VaXLfkHV MCd3GqMY79PJKcVeW4HJNHOoZUxIT+poT8RH9nQqUqJ3MocwCeaYDYTdHo2oYA== 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 4Mhfhf2L7vzZwB; Tue, 4 Oct 2022 14:09:22 +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 294E9MB4073544; Tue, 4 Oct 2022 14:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294E9MmD073543; Tue, 4 Oct 2022 14:09:22 GMT (envelope-from git) Date: Tue, 4 Oct 2022 14:09:22 GMT Message-Id: <202210041409.294E9MmD073543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 1d41a0555787 - main - Fix kernel build after fcb3f813f379f544f9cd2a10d18045588da0e132 . 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d41a055578704a28b34820e0aaf14a29f28f413 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664892562; 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=eSSWsIVIXjPqeTqq5DVbcE2rpAVLoNIGd/vv9Kp1Hx8=; b=sYVtNbIaqlrhiNA+a1XRJAJ5pS2AqFdduw2N1/PeT+OBox1AA6cIiCZESvnPHiwpKUfirM gq/TNGbZ96K1LQm429CeDCA8JTzgIt7/eYbjfuY1Uun/HUNkOueHc25diyFlFh25omcSfK otdPvJEg9U5kFvH1Il7sJhDwPj8F5tQzZ6uNULyHGpXrbR+ehdbtAmAYP8i6+wWWw66mv4 uQfsfv4r14xkCz7AhFop0GnNf11k6dCv8vJASUqEcKNNMc5geup1Pa6kc2JQihcJ5UpRzF AtLDGlnQvaUKqnX2MNT/4A6dVrBfgcZVs/oxTdhS+Vx/BIK+bc5/BjzA2rIm+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664892562; a=rsa-sha256; cv=none; b=jhswEzvHmLV6oztD58P3O18WdB+mGgauOJ6Zb7dv17nAzmzWvKxRHHuSzJ+RzSi92AUy9I p3tojWcoBsvdz7lfOOckTzbnjIPkVmfX9OTYc/F1HZv+oDGLf6GLq/0dq54bK/NPbsygYS 2esbWig+wDzCUtapaY9uGqub07xJpEjCZBY8/7KtnzEw7K3WUmyiK3mQseQlbj7MdWo1oN 95cHFCQ2nbyMRhgqlDCMCDfsqi87WpeW/4pV8msSFvjJaVHcBjuP926tvdvWPNoVjbP7My LYwxuCCieALZcyXoHjIsHbBcGt5VD3YOzo62KalGD+gd7TPzJy8mHewhoaVOIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=1d41a055578704a28b34820e0aaf14a29f28f413 commit 1d41a055578704a28b34820e0aaf14a29f28f413 Author: Hans Petter Selasky AuthorDate: 2022-10-04 14:08:20 +0000 Commit: Hans Petter Selasky CommitDate: 2022-10-04 14:08:39 +0000 Fix kernel build after fcb3f813f379f544f9cd2a10d18045588da0e132 . By adding missing ifdefs for INET and INET6 when building LINT-NOIP . Differential Revision: https://reviews.freebsd.org/D36731 Sponsored by: NVIDIA Networking --- sys/netlink/route/neigh.c | 2 ++ sys/netlink/route/route.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 44245e14b6b6..076f4bfafdf4 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -127,10 +127,12 @@ dump_lle_locked(struct llentry *lle, void *arg) struct nlmsghdr *hdr = &wa->hdr; struct nl_writer *nw = wa->nw; struct ndmsg *ndm; +#if defined(INET) || defined(INET6) union { struct in_addr in; struct in6_addr in6; } addr; +#endif IF_DEBUG_LEVEL(LOG_DEBUG2) { char llebuf[NHOP_PRINT_BUFSIZE]; diff --git a/sys/netlink/route/route.c b/sys/netlink/route/route.c index 63489dc8173a..7b4fc64ec4bd 100644 --- a/sys/netlink/route/route.c +++ b/sys/netlink/route/route.c @@ -282,7 +282,9 @@ dump_px(uint32_t fibnum, const struct nlmsghdr *hdr, nlattr_add_u32(nw, NL_RTA_TABLE, fibnum); int plen = 0; - uint32_t scopeid = 0; +#if defined(INET) || defined(INET6) + uint32_t scopeid; +#endif switch (family) { #ifdef INET case AF_INET: