From nobody Thu Oct 08 15:09:59 2026 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 4j0thR4Dr7z6vmws for ; Thu, 08 Oct 2026 15:09:59 +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 4j0thR3kz9z4lRc for ; Thu, 08 Oct 2026 15:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791472199; 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=Of/G/MFU/4HKI7+QvdunIzJ2+wsYsWTfEPAlBz6Thlgcr8cxQnRVfm6HPEkf7NMvmzjaTZ UiK4zC20qFMIKlzvJwgVOVzIAQIDsWn+4/CpeDmksTtXkFphkjJX3s4+SmK5bIJ5b4JKMZ FfZfJiw2vAWysqxSD8rdk8m0XOlxJzXpJvbgraQ9QzznBraaeaZDkj4+h1wu2zWOct6Mwq UsVPVcgIXiiuIfmcOpJBd1/fWVtUPgmW7UHgLaiD4dYt/x4YZ/bFQZN8MR6h+8vKkNu0bT aE74Se/LZ3A2VrhyvaCH9t5SDchPmEBtn3vP74lWWzqQ1TYciz7tRuK91+KqzQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791472199; b=IGxI9OpeDOSB9MzWo+GTnGwiOHEZ5zMYBloh3apHXUUDoFolX1inQUvDlOdvet3ymWtqpQ pvvCTkxZjRAnQTED4sMhL6etc24jCsTOUKi3Za4lW1w7ROaSewRshxS+TSF9Zug84sflye yH6JvakZSrPlcBViSpgvV11SyZf6Ji71gHwTgoB8teo4MBA1LlH7UiMjyX2UwplCqF5nLu kVDF3ZSLM5L7HSZhz/nzxuz4vGToELxYdyRb0LRrAxHI08ds+YdY5VBMNzmFRswYDG1KAr K8pagZNwD1ieCM9ITJdiCRQ5PbBWFcump0uHhQ+zOjVUUsz+ngdx/NEGhB/HEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791472199; 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=g7y1Guk68ngCrhHNz1sYJJ/iczf8hZzvnaZFgvAcgN+AmpqUszsCe0DyDjcbtjvYymlshC i2NRxod7nwKi4hGavDMltyVfRtZJ7/Vw+HVxC/9n3LMMPErhlKAFR1E7RoSnksCoWbnEKd IBYzbjGLh544Ea1oOafxBXVQTDwxOBzAVWLis/Ete48c6rcx/ebzueO8BRBuf4CYWEX04Q smn6gjfcIeh/x7ck9SByXMr2zMjNk1LrVWmAWJtYRcje8J6Q0JXnbJ1iKEGcWgn5leWAeE IMf9c/c4acR6NDRaZlmxKylxQ7ZjWq4pbaaiDG9CuuAt1O8FrVtxuqdqZS6v4Q== 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 4j0thR2YLmzlRm for ; Thu, 08 Oct 2026 15:09:59 +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: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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)); }