From nobody Wed Mar 30 19:07:27 2022 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 002571A4F3BD; Wed, 30 Mar 2022 19:07:28 +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 4KTGCM6Txmz3Kp9; Wed, 30 Mar 2022 19:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648667247; 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=TKJNAIJinC2Mr++oF6gozuvRl5UjbB5Ua0dcIZMZWsc=; b=xc9pB5cCK04hh4yQOvqMZZ8vFRywa97Ur54SZKwHdwfoGwexLeSncM1Yrq60T7xFpCLg97 vmXSJIPK1yNKuah7c8M6/d2yVpEl/6Bw9XOU+GRuJkejF848tkXbvDb7Y0EvpVeZEA6rtw NgGs+SxQzBImS+Wgo4hTrDYN9rxbHQG2Q4sVml3WKcZaJi7rxH5xtAB618X2JdgKE50swE TPNftJBgqcJqSlkZ2HlYcSmz2hQ3nFIFhri97aeL2N/DmBQ3ywhQ7CpzqwRd+T3Z+OBPfI HSAoNl9zPFCWpl4qcnYIqegY893ESHASbul+9Tbl5/MYXXJ5hlCXS4HwP8ZrTA== 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 BAB2918E88; Wed, 30 Mar 2022 19:07:27 +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 22UJ7RNb090879; Wed, 30 Mar 2022 19:07:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UJ7Rwc090878; Wed, 30 Mar 2022 19:07:27 GMT (envelope-from git) Date: Wed, 30 Mar 2022 19:07:27 GMT Message-Id: <202203301907.22UJ7Rwc090878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 331335c1b846 - releng/13.1 - Fix kernel build without INET or INET6 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 331335c1b846fce7044bba1aac76c9017cf70800 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648667247; 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=TKJNAIJinC2Mr++oF6gozuvRl5UjbB5Ua0dcIZMZWsc=; b=axYqh8A/P7tJRo7t0wzg73V4Po22OLeqLo/gbCy7mTRSvr0nWCEfwl4niXHlsnqGlAt8fY zt3gY+jYBW5+u7uPLbR/WbURjciXT/Kli73NJNMQJwM0pESBnxniWK62Xdn/bcsOnmYDPd wNsH4frrzIgCCvRlqhcr0+U6C1rUG/WDbzIuEYKXeLakOynjkv2RtEclieG0DO1R3m2el3 0L9Q+dBYv/+bsBY890OCxfQ2Et74B1chTSKcMvF28PU9jO8QHmUjQt6IuM9rb8xTBGCzGV vE2D43oTlUvrQNTnrgKA4O6NDk5ym2jbSoEQvGfLwUo5uEixIepGvoTHdcqYyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648667247; a=rsa-sha256; cv=none; b=V5WEcabWKmuY00rhwW0Naupey362bh+eOahX8qoC21NTlWyWNQ0oyGKZQ5mXWqN5IQ2YpB NRshM+fO3hsJvIINXRKbtulPRDBZA5Jj8V0k+MwKrnlAqCKPl0zqjADtY3vO5t7tprdpkB eV7+C35zejcM8oca+gCYEagx1dWYxtqcir6C32Lw2OURkNq3bQ+RaqZcd9Ev6+teaa9Mjj WUmmEwubxFQCdJTOGlIE2fJgi6849tehjgA2pKvvfRX4ZhfJnNIgN60c90xmPJlcOCMVMh 1V5fCVdwaVY8lNYN3PNcvUPGNLPkF38AMy5jDQ4/MfBQgK3fp+V/UkM9weuMTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=331335c1b846fce7044bba1aac76c9017cf70800 commit 331335c1b846fce7044bba1aac76c9017cf70800 Author: Ed Maste AuthorDate: 2021-12-30 21:49:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-30 19:06:40 +0000 Fix kernel build without INET or INET6 Reported by: Gary Jennejohn Fixes: ff3a85d32411 ("[lltable] Add per-family lltable ...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 818952c638a72bd677345fd8ddd05c31b34a2aee) (cherry picked from commit 85f3c0a1c3762f32dd133deea5951de205e2450b) Reviewed by: brooks, melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33718 (cherry picked from commit a6668e31aa3cc855bfb37d6edc05122514592a47) (cherry picked from commit 1c487a5d3daccb8489c710d8cfabaa83fde1ca58) Approved by: re (gjb) --- sys/net/if_llatbl.c | 6 ++++++ sys/net/route/nhop_ctl.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index c61a19f39de2..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)); @@ -781,10 +783,14 @@ struct lltable * lltable_get(struct ifnet *ifp, int family) { switch (family) { +#ifdef INET case AF_INET: return (in_lltable_get(ifp)); +#endif +#ifdef INET6 case AF_INET6: return (in6_lltable_get(ifp)); +#endif } return (NULL); 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);