git: 12e25072a868 - stable/15 - route/fib_algo: Fix FIB_ALGO without ROUTE_MPATH option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 08 Oct 2026 15:09:59 UTC
The branch stable/15 has been updated by pouria:
URL: https://cgit.FreeBSD.org/src/commit/?id=12e25072a868d039f08509d39a40be3b714d3638
commit 12e25072a868d039f08509d39a40be3b714d3638
Author: Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org>
AuthorDate: 2026-10-08 14:42:57 +0000
Commit: Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org>
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));
}