From nobody Thu Oct 08 15:09:59 2026 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 4j0thX4ycVz6vmww for ; Thu, 08 Oct 2026 15:10:04 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0thX3CTHz4lZf for ; Thu, 08 Oct 2026 15:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791472204; 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=h1+NlvsQSUF1UUALBptNfNf6xk6g1v5bv/xL19YOs7I=; b=UCX4WCMraRkkzkuV3/3Il8NtpkhrYc5k8RUYX8ovQLS18zfaVSxwzzyLrK+RYCVAhyfKCG ZJhxI+usqlLTJv6Ac5UgIUoqKlSNR5Ni2fwJceEUcFasNDmhrcLIHC3XUGvO3DIaiC0o3N k/3iYma5r9daxb7v4Q/NXLyHmu3GcRN90qY89Xoi1H+4MjaGv18ZSAYOK8Ni+P3Zpraeoi guzlTjYcbGkibluD4FpPSqCKX95fkNnjHTQBIgZrnbD8vGJ1T1i/yhccQASnquEyw4FcKE 5+yp+0Klk9XHPtwMFZckbl/S2V0q1RRpB6mNdaiMHsvKESM+ysFgyfNAA4fmDQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791472204; b=QpSOeQf5JMZ0LX8NttI3Jsk9yNG5mttwTxauv7RRrMRTtyG8gaMbzkzIj72DuiRzAGZEgt 5Qdsof3NUqQQ5vLlXeiSPHZGAN4kJvaR4yI4MCrsIUgFJZh/3kNnt5IM2GhjdhGK3vOwDW 1yI2eJt9IhS5fcHYZ79DNyFwC7TtEmg+PjvBdV/zgh+n0XsM/b3rJc/Sx+HZjndoBQU8AO Yj9KXyiWhdQkEojF/acNK2Wskzy+hNbBhK0XZrlNIDXcBxk9/8W6L9XTndz0df8O2cr98c fHuQRp0qZ2wxRXsZ5RTSMau3JFgUjqH/Eo3e/Wcov3qSwsLJ335hhyn5UVvT3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791472204; 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=h1+NlvsQSUF1UUALBptNfNf6xk6g1v5bv/xL19YOs7I=; b=xgeAVV9eUtKS3uqBPRMJnzVAcbrubKf08K27u9D2ziHst7tC5DP8k9X34bCiByc6gVuAKq FRACm/ClOdYycP87smyr3d/c9KvpHGb5MKdIhrw5+Wf6ZfAascxozRdXPbbjv3e7+UMCRc ndijy5hDOPw6JNheP9yMaUAvl8CHVnOjqGh1pvgNeQnV6eZ9E2QzxIgK6tVbqAxAJ/2P35 FLz38rTk1RSyy0YIBOLzOWMD6HUg4ejecQhB/VIcX5wANoGOXLTLhgMXNWXK93av0X/aym D9i86iibTmWdQZHxkeBirIVa5sdMVSWMJnfV4v5/WToYpmEnOkPd4L24lADJPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j0thX20VYzlXR for ; Thu, 08 Oct 2026 15:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37563 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 15:09:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 12e25072a868 - stable/15 - route/fib_algo: Fix FIB_ALGO without ROUTE_MPATH option 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12e25072a868d039f08509d39a40be3b714d3638 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 15:09:59 +0000 Message-Id: <6ac7b247.37563.15642fa3@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=12e25072a868d039f08509d39a40be3b714d3638 commit 12e25072a868d039f08509d39a40be3b714d3638 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-10-08 14:42:57 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-10-08 14:55:46 +0000 route/fib_algo: Fix FIB_ALGO without ROUTE_MPATH option The ROUTE_MPATH compile option has been removed from CURRENT branch. Therefore, use the ROUTE_MPATH macro for nhgrp headers. PR: 299210 Fixes: 891bda143f6b ("route/fib_algo: Fix nexthop index ...") Differential Revision: https://reviews.freebsd.org/D59552 (cherry picked from commit 63343822430453f4add20bcbfa134c99132361df) --- sys/net/route/fib_algo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c index e1014c3cf4c4..e61a966624c2 100644 --- a/sys/net/route/fib_algo.c +++ b/sys/net/route/fib_algo.c @@ -1821,9 +1821,10 @@ get_nhop_idx(struct nhop_object *nh) static uint8_t get_nhop_family(struct nhop_object *nh) { - +#ifdef ROUTE_MPATH if (NH_IS_NHGRP(nh)) return (nhgrp_get_neigh_family((struct nhgrp_object *)nh)); +#endif return (nhop_get_neigh_family(nh)); }