From nobody Mon Jan 23 22:11:49 2023 X-Original-To: dev-commits-src-branches@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 4P14852hRlz2t0Vy; Mon, 23 Jan 2023 22:11:49 +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 4P148526Zkz3KfG; Mon, 23 Jan 2023 22:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511909; 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=w/AdHrr6QaZ4iub0KO0GSpFvCslaPineb96g+XDgvpQ=; b=Irc6Qeuv8OpOQMZbEqKX9knMuvy/s8xCNmsGTSzrMlXZd/NqhBnSYd5nCQ/159VBG7JFak HJWV/nxz9RHE/0A9wQW9j3V0b5cZb2gEErWshypVMi0V3EXDApnTn3wjyzlQOwRbX0IkE0 HzQ2R5wH8AGTEvhBS8z6zmzmlzWCmJiqwN2HbI6o+ywVOvhFkHFy/5LEmUQh8YB66VwnSk Z3Ce4jElJa039QrDI4LPpAuDqGu3G2l+EqscoRnBLxbFY1Ackn8QK55CzMW47C0yP0v0lX 1SbYFet8Dr96frKzVSumUcgWGDWDxVq+3VR9Z5YhMiFZU5258GoUSVSxpvAAdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511909; 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=w/AdHrr6QaZ4iub0KO0GSpFvCslaPineb96g+XDgvpQ=; b=PAew+n9Df/975BQS4LA0UhrHInYiJ3iukQJzqbJGBpcSOitVZJjFX1LCMuUqfA4w2qNUfX 4IUfEY3T/DQW01qDF/OqNgNt5AO9z/+y1aHIC1DHRIve+cxty3uOBx2YstZfksGYR1MnBo bkhUWdReNjugs/+R4y3at5EmMuCd6tdOxk4FWgxXmExU2WQ7hEGNRBZUJv9fAmCvKdXJS6 e79JnusJenDiDGK4Tj4ZF3c5Avh0ETbI4xE848VIh9BWCQdOTOmz8y8cKFCvnkBLkl+kqb z1RtIDGSKF44rROnbY6ALO07PgnQz5ZW8z/vh0PxsyPqzPa53jfl919Itr67+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511909; a=rsa-sha256; cv=none; b=qlUg0iZbGGVpqL+i6x5IuXTpNOp68xHo3bxkX8vPqMjujAm2qcB7OivBxOw202I2Ygrsh5 ju9Tt2mwKKbJ4mi4AkKLaDGqlUuLy9XpxqqQhSIDQboLcuQ+gvR1Mx4eH1OKwLbmoSPk7V 8LYQMFH11tnaZKbw7tavA4+tNsROE0RoVaTi9++ejz6rlxvGA5kriXY9Eb3n5r45HJU/Yl eSnXie2YDkffEvpWrMNmw/fR5bY4JeXQf7zKElTYfwi0I7ivOIm5ZmerwN6MLlfTo40fg9 8cm0o71lwR2AM9HugCGzk/+JUKdCr0AM37z/zzOz3BE5SF2gVjsDS7lGwZMBQw== 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 4P14851C0yzlk2; Mon, 23 Jan 2023 22:11:49 +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 30NMBnEe012583; Mon, 23 Jan 2023 22:11:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBnU0012582; Mon, 23 Jan 2023 22:11:49 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:49 GMT Message-Id: <202301232211.30NMBnU0012582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: fc65965e0184 - stable/13 - Fix kernel build after fcb3f813f379f544f9cd2a10d18045588da0e132 . List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fc65965e018461cc7f71a5fa554576dcfbbe6053 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=fc65965e018461cc7f71a5fa554576dcfbbe6053 commit fc65965e018461cc7f71a5fa554576dcfbbe6053 Author: Hans Petter Selasky AuthorDate: 2022-10-04 14:08:20 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:02 +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 (cherry picked from commit 1d41a055578704a28b34820e0aaf14a29f28f413) --- 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: