From 5fba382568cb45ce30112b566f801fefcbb1fbfa Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 20 Sep 2024 10:58:46 -0400 Subject: [PATCH] zebra: Pass in ZEBRA_ROUTE_MAX instead of true zebra_nhg_install_kernel takes a route type. We don't know it at that particular spot but we should not be passing in `true`. Let's use ZEBRA_ROUTE_MAX to indicate we do not know, so that the correct thing is done. Signed-off-by: Donald Sharp (cherry picked from commit 58722b94484b7838eee15b615909c44ec08289ae) # Conflicts: # zebra/zebra_nhg.c --- zebra/zebra_nhg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 6235ecada4e1..463f84b2b438 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -1154,7 +1154,12 @@ static void zebra_nhg_handle_install(struct nhg_hash_entry *nhe, bool install) "%s nh id %u (flags 0x%x) associated dependent NHG %pNG install", __func__, nhe->id, nhe->flags, rb_node_dep->nhe); +<<<<<<< HEAD zebra_nhg_install_kernel(rb_node_dep->nhe); +======= + zebra_nhg_install_kernel(rb_node_dep->nhe, + ZEBRA_ROUTE_MAX); +>>>>>>> 58722b9448 (zebra: Pass in ZEBRA_ROUTE_MAX instead of true) } } }