From nobody Mon Feb 27 10:36:09 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 4PQH3F5plWz3twlB; Mon, 27 Feb 2023 10:36: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 4PQH3F5PK0z4DkN; Mon, 27 Feb 2023 10:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677494169; 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=r1o0dURGpUJhIWnHiBmOfsnNwMKX2jxRobJ9NDDI4ak=; b=ALmapi651ua13mk2x78f0s69CnxD9PyrFTSXr1JdBp7hhSn4oO+oA0V2UHPigVVN2tLzGz sgQ+J+6+5Qf4R4iCNH71a4pEBVyRkyUSqL8xCl+oHkvugSZG9IqdewlDOEpqrMJmkuxV8i LRkxZ0lAwSVDTyJQ7W5Dlg1IZ3tW/FIxdh+2RwouNeUL1Nd82Mt2DwQSRUjCgw6OGc9s1/ 5m1BfsYHv2vKLFAf0dc+kasKOiMscVjHABhtvf1/qFHPkwfvIZe8zfkSu918THC/pUi1EC 1XpIYON4o4vrbl8PlhNiCa3o5ahU3jk0YDj6NlNutLuxGOtxkiiilgpoqIeThw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677494169; 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=r1o0dURGpUJhIWnHiBmOfsnNwMKX2jxRobJ9NDDI4ak=; b=h4R/JWX7wS9qEGg+7BywYKpk2q4sTBpKdhQA6/RmJ/zdyUKq9G1S57zSVdJIR0Cp5RxdrB h3ENFPzZJmmSbHyrinuzfiy80b9pqy9+qM++x6EqGybVzctjn8csk+BX1Yo7myZiqEJKGp iPEwPO4cqpBG0Zs5PvfReZeChfEb80sRmL7LKgaREaxkBCNOEPZG9PRzKSzulaxcmWkGpo kNoPzOx/rGpYkYJrh1/l164yNn0+N/IAMOogF4pKCnb38ZfsMkz9eMkHo4Vh8KDUlshVZr +mkwqcTmJY2JbOzkWvkNgcU17/ENucYIU8NWHKCKAJ1xudmJAgsrg0Qail5sTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677494169; a=rsa-sha256; cv=none; b=rt0kWkWlPA6fIaR6hBhDcsaEixjwjnWrcT6vloWFfb5pPCB1/ntZ8sYh+kJ0wgPJT8Q2Hb Kwx6MnJ/c2W1GnocR7FuZ3Vn7H9/YA6rIPfveIJxT1ePl4yunZ6S7GhONHz4SfPqxNHer/ B96mfAWWwOhMJoWkEbwOR6G9lTeUxxcTRLXTLRbxrSI3vQXMl/D/TagTn29ZhljK2ZcPvA pOJgRVmA11qURLHhE4CPd5DnBkGrU0JCEn8id25b58ozerus7Gs1mXmdzZ50I4hc43gUTs aMgoe4+ZjSDd7Mislp+VJzBy0M1K4oS1Luvj90/oadDQuVM+IAr2JBw+wWyEzA== 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 4PQH3F4Tb8zMcC; Mon, 27 Feb 2023 10:36:09 +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 31RAa9pB075598; Mon, 27 Feb 2023 10:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RAa9JU075597; Mon, 27 Feb 2023 10:36:09 GMT (envelope-from git) Date: Mon, 27 Feb 2023 10:36:09 GMT Message-Id: <202302271036.31RAa9JU075597@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: 7af6e00d62f3 - stable/13 - netlink: fix NOINET6 build. 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: 7af6e00d62f3ba75c91146015724b44a05567efe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=7af6e00d62f3ba75c91146015724b44a05567efe commit 7af6e00d62f3ba75c91146015724b44a05567efe Author: Alexander V. Chernikov AuthorDate: 2023-02-24 10:19:12 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 10:29:53 +0000 netlink: fix NOINET6 build. Reported by: Michael Paepcke PR: 269787 MFC after: 3 days (cherry picked from commit efeb8003117073d29bf82c8a69e036b8dbd78352) --- sys/net/route/nhop_ctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 390e5eddd496..b92977ca42b0 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -835,16 +835,20 @@ nhop_set_blackhole(struct nhop_object *nh, int blackhole_rt_flag) bzero(&nh->gw_sa, sizeof(nh->gw_sa)); switch (nh->nh_priv->nh_upper_family) { +#ifdef INET case AF_INET: nh->gw4_sa.sin_family = AF_INET; nh->gw4_sa.sin_len = sizeof(struct sockaddr_in); nh->gw4_sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); break; +#endif +#ifdef INET6 case AF_INET6: nh->gw6_sa.sin6_family = AF_INET6; nh->gw6_sa.sin6_len = sizeof(struct sockaddr_in6); nh->gw6_sa.sin6_addr = in6addr_loopback; break; +#endif } }