From nobody Wed Aug 10 20:45:38 2022 X-Original-To: dev-commits-src-main@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 4M325G2020z4YKHR; Wed, 10 Aug 2022 20:45:38 +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 4M325G1VwMz3yJ2; Wed, 10 Aug 2022 20:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660164338; 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=U1l4Jg+sYjlNTL1diawcYjAZu6qTMF30OPmdSehNJPM=; b=M5tYrHFT56nOpvvqkS86gGuQqaiG2l4MaZ9bTKdbAkhOhLWjiXAxofzMTXBvbCkqCaZ14S 1EFfteuDOoyKgVRNqpjR1qnqMPhtkQX4UD3o7ZEcg/GS81zTfA6AIqXz+Xm+3SY+qUygvf n84nZBAfFGh2/pFwNL16nWzcmqx/fDEYIRBuJqLRuNeS/oDF9zAn6Y/G/SMnf/MfCuRnyc CnRm6sThiZD5wVw/kx97O/lHCAIfXM4p466Sk5ksJhizPV1rxPJ7UFklYZe1sjhhxE1qKj JbW+w0u5sAbg1RNlyGMxq71dSTtA2i77Z4wTjhplw5N9TVXMdJXWoiaOu9bMwg== 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 4M325G0Z8MzQTB; Wed, 10 Aug 2022 20:45:38 +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 27AKjcZo054933; Wed, 10 Aug 2022 20:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AKjccu054932; Wed, 10 Aug 2022 20:45:38 GMT (envelope-from git) Date: Wed, 10 Aug 2022 20:45:38 GMT Message-Id: <202208102045.27AKjccu054932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 685866bbe13d - main - routing: fix build without ROUTE_MPATH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 685866bbe13da2b9c5d108036c29f07a4c7cd04f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660164338; 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=U1l4Jg+sYjlNTL1diawcYjAZu6qTMF30OPmdSehNJPM=; b=CfHxMh2Z+KR58fUC4ajoxerZxG9eFLCPaxTBLhtXfRFYonps8ff+ZtX3relGizVFQLNdIp VjwxKn4uVa3XUuh6rN0uY+qjnhc46fhhAZxNCJuNgaUvh30hZPSKogPzH+lKkmNu0oYW9d 7nyqDaTBX0+Ss0nRl9c4pJhij5l0i81t4wxUrxgi1OzBUt6v9a1MPJbDB96iLSoXBxh1uj M7pnYowRIT34mVRF1xijBQBugKwpBnL7FJCgsK2NZpspSK9UTudCs5aWnxKZ1eGFQcx3fk M/SXId/Mt85lnXCWAbJiTDGM9D7NDr+e3/75+climyIccCnMN3TwHlT5T3QiiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660164338; a=rsa-sha256; cv=none; b=F3zq1B7iO7WeOBAFEnm9vX6mZqePYKAssU9DyPAHrvMm5KuTRT3mKoadbIZy+f/o6J8//d KHgSJn1N6kiq4IuWxZqjAHeBI/suL2b5OsGF5yIZndKkha399E86+0Kjfldm6atKwvRuvU bUdUz7ihm72BBebXqYaly/Hfr+sGKJT9Ca+fbiZP30V2elosWXsLI4+zlyQnfTIRVzfEeU 0o7Yna0PBRQ7AXoAnYhhakZNooB8copQYOLDNyVhFiFvZ+26emE5VgjCAjqLLZaJKLaHw1 oC6dCXyEZ+8qN9j9/oZXAWkYdvLQ5E/2TOFZEkNEe7X4PGaAv9ZDvH8pgsDScw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=685866bbe13da2b9c5d108036c29f07a4c7cd04f commit 685866bbe13da2b9c5d108036c29f07a4c7cd04f Author: Alexander V. Chernikov AuthorDate: 2022-08-10 20:44:43 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-08-10 20:45:22 +0000 routing: fix build without ROUTE_MPATH MFC after: 1 month --- 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)