From nobody Wed Jan 05 14:42:23 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 A0352193B179; Wed, 5 Jan 2022 14:42:23 +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 4JTXJH2ZSbz3tmx; Wed, 5 Jan 2022 14:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 38B2662B2; Wed, 5 Jan 2022 14:42:23 +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 205EgNUV081409; Wed, 5 Jan 2022 14:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205EgN0M081408; Wed, 5 Jan 2022 14:42:23 GMT (envelope-from git) Date: Wed, 5 Jan 2022 14:42:23 GMT Message-Id: <202201051442.205EgN0M081408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a6668e31aa3c - main - Fix kernel build without INET and INET6 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6668e31aa3cc855bfb37d6edc05122514592a47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641393743; 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=bUAmuWipjc+R0B9XudLBcxID2wkE2+bkcPxnTJVHY6I=; b=GzyXKEKCPU/5kbyeuIbdXYe+OzGxScmhyfuXk+cuvhQffjVtWC2/RtuzRzd8bsQmxqJc6i LpnR5ZoxCICPFll6p0GySvSphNtItKK1zs4WKrtVz2gJcQjyekUmO6ET4oI7T/pSFcXhFy B7C3hb4Eq1FRceiDj6Vq8pbXSSlHQLrssx+3ixZ7p1zHzgTBqS28seimFBQK4PcCQA+JOh aNU0mdoREn123AYwxdaWeQ+roFFKnFsofrJrI/8Sf9snNfIgHbKoSJaLirlryaBGL1CxHY nVJYMT5r4+NgniFEynp2o+0GDgp5Njav59/e9ODaYIX/h12tHCcrrzgCeIPdmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641393743; a=rsa-sha256; cv=none; b=uZZAuSCaCIgvQ+4iT64EKzf2QQUq6oZ97zxHdrKuJaxiWXMYoSKbTv8MR75my669hJPOY+ zdx2NYdaBOLuNJTXttx7stpO7acqxqx/OOdYMiaqwO7AOUxEMk2zQnl0/pALl4U1GeX87V KSTEgW8NhQ8zeMe2iWt+vnpg85NYMYv6WAzyUFm+5Z+mDHp9khCrJqfcITXuKFBGa9CBu+ lvuSCuKjZ31ueXl5pZBsRwWiILApq3VmWEDkKcUrEsaGAFWfa2iw6GAw4JRfcgFzUwOPbx pRxEWYQMODqmN213dBxFUuxz8WDqOM68pxv5Me3CsYdMBtcP4dIpU2AKCLptSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a6668e31aa3cc855bfb37d6edc05122514592a47 commit a6668e31aa3cc855bfb37d6edc05122514592a47 Author: Ed Maste AuthorDate: 2022-01-02 00:53:42 +0000 Commit: Ed Maste CommitDate: 2022-01-05 14:41:38 +0000 Fix kernel build without INET and INET6 Reviewed by: brooks, melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33718 --- sys/net/if_llatbl.c | 2 ++ sys/net/route/nhop_ctl.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index 418f4135185c..b82bc9fc104c 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -443,7 +443,9 @@ char * llentry_print_buf(const struct llentry *lle, struct ifnet *ifp, int family, char *buf, size_t bufsize) { +#if defined(INET) || defined(INET6) char abuf[INET6_ADDRSTRLEN]; +#endif const char *valid = (lle->r_flags & RLLE_VALID) ? "valid" : "no_l2"; const char *upper_str = rib_print_family(llentry_get_upper_family(lle, family)); diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 233a2a677678..16b8ca46739a 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -830,7 +830,9 @@ nhops_update_ifmtu(struct rib_head *rh, struct ifnet *ifp, uint32_t mtu) char * nhop_print_buf(const struct nhop_object *nh, char *buf, size_t bufsize) { +#if defined(INET) || defined(INET6) char abuf[INET6_ADDRSTRLEN]; +#endif struct nhop_priv *nh_priv = nh->nh_priv; const char *upper_str = rib_print_family(nh->nh_priv->nh_upper_family);