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 <[email protected]> (cherry picked from commit 58722b9) # Conflicts: # zebra/zebra_nhg.c
FRRouting · Sep 20, 2024 · 5fba382 · 5fba382
1 parent a4c96c6
commit 5fba382
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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)
 		}
 	}
 }