From nobody Fri Jan 13 21:25:07 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 4NtvZr0shmz2qkry; Fri, 13 Jan 2023 21:25:08 +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 4NtvZq6TwCz41Vy; Fri, 13 Jan 2023 21:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645107; 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=Z+Npuyeibp1w89Ztgpgx6HYETiTOMKKFJbWuLxm/IHE=; b=sbxz8wh2U9RsMqkNiXxL82BzSvH9vJkiJttJw9NKTIRAgYjlnF8neqsS9WXmn3qRBjmJAD 3Rkau+TTD3Ywma3dUAQhBq4K131CoohqMq1qFwX7XkhH9YjCPikvCqIZzIHahTHii9wipc Q5WI/tITsj8a8LDQ8Q6U+ezb+UcY8C9QhvevBaYaM8BeYRHKdHDCrQNn65B9NF/3sgwjbu 977X55QJrpqs2ZrbRg4m0tii5po6MxCxa9FxZy6xu3zGAwGJsuQxSLI0P30MekQzYU/AbN 82hnrorA5rbKx6Ypm4bhEXHI6Jr18WjTDIv3T49YLuhOUa3qgTWX+wxfEHapyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645107; 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=Z+Npuyeibp1w89Ztgpgx6HYETiTOMKKFJbWuLxm/IHE=; b=uLits3PrLbfZ3KF7oDhZZhgJllKHo/6ekGrB8z7W7ecuhizJdCFkOsjE/tbhlSXjGgNx0Z /k9OXecvTLFSmsQIZcCgcmMTw5AR7QPyLj6lzV5XIdBHgcmLWRUbjpIvv44L8BsQrOrxQy 1NsSAIpA7pV5l6YTHCURy531JhrhM39qCZJfYZZBI5UFmnp3QzOfPXp7lqUMOPavqcFdtn CmUepie5S5JI1icyeVnYPEroV+gfQC5zVVbM7HWZgj1YGqjJR9ERIREeEBb2iMKO7yYOp3 2BiJyFp/7cfzcz+xplosCHVY3Cchaonw9mFA3BFA9QC9jPD/bZfVmm/ds9hh9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645107; a=rsa-sha256; cv=none; b=pHdvVsKtqLXe5oH9OqYLEjgpemlvp9Pv9a/p+ENoMfFAVMGjp6Iwut6B/9VlngFBJAjpVa 3/TmGNb6/6TdP+NT5dqjesbMqJJGgwNft9Cf5s8bG5COipXZDHj7Row/aKW1biIGLeVaaF +dyVaFQYd6yK7ydy+nouJvlbsZAvHuoDIdnJPhXl3VO+8zF57uBhx5KHP2l4AYAe5n3B4S M4jxta9Ch+fvYX4EwmCUlt7/jN/i8WJZ39oc3qstjRndOIlZx0j3zUBZRlpDKLQRma0sXs vsVnBk9Q4V0RTVaXhD8HviBNdhpwfF8RfvGkrF3MwQTPpplHMiAU/R2hZiiP9g== 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 4NtvZq5b18zNGY; Fri, 13 Jan 2023 21:25:07 +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 30DLP73C041419; Fri, 13 Jan 2023 21:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLP7SV041418; Fri, 13 Jan 2023 21:25:07 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:07 GMT Message-Id: <202301132125.30DLP7SV041418@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: a722ef2ac109 - stable/13 - routing: fix build without ROUTE_MPATH 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: a722ef2ac10978965bd965244223266376040b34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a722ef2ac10978965bd965244223266376040b34 commit a722ef2ac10978965bd965244223266376040b34 Author: Alexander V. Chernikov AuthorDate: 2022-08-10 20:44:43 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:27 +0000 routing: fix build without ROUTE_MPATH MFC after: 1 month (cherry picked from commit 685866bbe13da2b9c5d108036c29f07a4c7cd04f) --- sys/net/route/route_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 8418e8ddd1d5..34b00a0b82ce 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -920,11 +920,11 @@ rt_delete_conditional(struct rib_head *rnh, struct rtentry *rt, int prio, rib_filter_f_t *cb, void *cbdata, struct rib_cmd_info *rc) { struct nhop_object *nh = rt->rt_nhop; - struct route_nhop_data rnd; #ifdef ROUTE_MPATH if (NH_IS_NHGRP(nh)) { struct nhgrp_object *nhg = (struct nhgrp_object *)nh; + struct route_nhop_data rnd; int error; if (cb == NULL)