From nobody Wed Mar 30 17:51:08 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 317581A3A733; Wed, 30 Mar 2022 17:51:09 +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 4KTDWK0tzXz4nTk; Wed, 30 Mar 2022 17:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648662669; 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=okRtFSCYliNasci5toSGlFhYO7B6I0rB5EawsfPBRBM=; b=kuIlNcLLBcIAM1K6n/yCJoLdA0LslSSEukB8kDLGI/wxxFzmhvPtPl04ZtK704EVPGE+cH zDacnXhN6SKQX8w2scHn2BcgidHbT6+GxVgFiQB8auj51oso46ZXrZc88N/MGUa/lo4lu1 2dEr55/HY5mmAA639cT1JLFhXyKlj3Ec/jMIxbl/XvILsjuiuddXlvISSrNVRw83kVzmIT zi8AVPA3nJRN5B15hQS6soHTCghA3gpTlwnjy3oA4YuLRHLelOyWNyUHe0hKxnExkFsPCX GjzRMXZtrSWKykfV0mymuAQR7dmD1W5lb+j7WhLmkCIO79BCijL9APB95rGLag== 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 F29BB17462; Wed, 30 Mar 2022 17:51:08 +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 22UHp8S0094025; Wed, 30 Mar 2022 17:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UHp8K1094010; Wed, 30 Mar 2022 17:51:08 GMT (envelope-from git) Date: Wed, 30 Mar 2022 17:51:08 GMT Message-Id: <202203301751.22UHp8K1094010@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: 1c487a5d3dac - stable/13 - 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c487a5d3daccb8489c710d8cfabaa83fde1ca58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648662669; 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=okRtFSCYliNasci5toSGlFhYO7B6I0rB5EawsfPBRBM=; b=gQ3C+eaH1l5UxCKK7CYq7qNKfLtH93x7H4aqyTTv4jgHBadDWUtL0ZZ6hSYlyUu5+l9QsL C6rr4QlWGJuHz9qHZmWljGgH6NeMbRNECrUqkSRk9yGLy9vMRq8fqBO6myACLzFhHked6C ETowpaJemM2ns+zSSEO4NGegfg15h5EBJWcdYXVDwdzu530k96juLj+6uz8+3TcWH16RoZ Fmx8I9hdqjAfpfJ9kL1uezODz8ipYym/0XR5TV5+Jmf6g9QWS/sFrxJMnUHKNQ9ixvPwJ2 9qN5uOwZSWXZoDe6Se9Bxwl6k2slLxuWK3sVQDdgZ2jMF88kJ0uIIJZmSQGtQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648662669; a=rsa-sha256; cv=none; b=gS+4XjZPOHrvDXFpNd2ZBo7qY8SusZ5M7PNjUMxo0+hPv+0GMK3nS/DL0Q5rDifMi7XXMA o/jpAEWOxwMS96/MiqY4NJ4eaCbJQA+80pmZwdD0ht8UQh6zibGeToEjDTegMPTy8t5BTr 7ewhVZxYzbu6VbVEKqqVQDr49BYUsLV2AN1ckYDKLIT5k8YDD7a+gwlIgiMNMqtyg/3g/k GotaM9dAP1sBGuTIEdOx87UTD3RQZG9+dqJdIZwBVM+ryQF6BDawgUsMV6WgWuPrshSM7S 299/j/1vk2JH6NAi1ecVSjglR50EMzgLy+JeZZLmp0OP089RyR9rSxSLEDvEtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1c487a5d3daccb8489c710d8cfabaa83fde1ca58 commit 1c487a5d3daccb8489c710d8cfabaa83fde1ca58 Author: Ed Maste AuthorDate: 2022-01-02 00:53:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-30 17:50:42 +0000 Fix kernel build without INET and INET6 Reviewed by: brooks, melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33718 (cherry picked from commit a6668e31aa3cc855bfb37d6edc05122514592a47) --- 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 c61a19f39de2..73e20eecf378 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);