Commit 7e71d43e77 for frr
commit 7e71d43e7795d6f55e8f22dd0fe803ce8b007f1e
Author: Donald Sharp <sharpd@nvidia.com>
Date: Thu Sep 10 15:03:43 2026 -0400
zebra: Modify rib_update to include type
The type was not being passed in, let's pass it in and
use it.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
diff --git a/zebra/interface.c b/zebra/interface.c
index 933c5cdb4a..06db724059 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1386,7 +1386,7 @@ static void zebra_if_addr_update_ctx(struct zebra_dplane_ctx *ctx,
*/
if (op != DPLANE_OP_INTF_ADDR_ADD && addr->family == AF_INET &&
!if_has_connected_with_family(ifp, AF_INET))
- rib_update(RIB_UPDATE_KERNEL_LAST_IPV4_ADDRESS_DELETED);
+ rib_update(RIB_UPDATE_KERNEL_LAST_IPV4_ADDRESS_DELETED, ZEBRA_ROUTE_ALL);
}
static void zebra_if_update_ctx(struct zebra_dplane_ctx *ctx,
@@ -2306,7 +2306,7 @@ static void zebra_if_dplane_ifp_handling(struct zebra_dplane_ctx *ctx)
frrtrace(3, frr_zebra, if_dplane_ifp_handling, name,
ifp->ifindex, 1);
if_down(ifp);
- rib_update(RIB_UPDATE_KERNEL);
+ rib_update(RIB_UPDATE_KERNEL, ZEBRA_ROUTE_ALL);
} else if (if_is_operative(ifp)) {
bool mac_updated = false;
@@ -2373,7 +2373,7 @@ static void zebra_if_dplane_ifp_handling(struct zebra_dplane_ctx *ctx)
frrtrace(3, frr_zebra, if_dplane_ifp_handling, name,
ifp->ifindex, 5);
if_down(ifp);
- rib_update(RIB_UPDATE_KERNEL);
+ rib_update(RIB_UPDATE_KERNEL, ZEBRA_ROUTE_ALL);
}
}
diff --git a/zebra/rib.h b/zebra/rib.h
index 2506f04bb5..5a4b7dd43a 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -425,7 +425,7 @@ extern void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
extern struct route_entry *rib_match(afi_t afi, safi_t safi, vrf_id_t vrf_id,
const union g_addr *addr, struct route_node **rn_out);
-extern void rib_update(enum rib_update_event event);
+extern void rib_update(enum rib_update_event event, int type);
extern void rib_update_table(struct route_table *table,
enum rib_update_event event, int rtype);
extern void rib_sweep_route(struct event *t);
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 99f87e751d..6e7a1d4e52 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -4914,7 +4914,7 @@ void rib_update_finish(void)
}
/* Schedule a RIB update event for all vrfs */
-void rib_update(enum rib_update_event event)
+void rib_update(enum rib_update_event event, int type)
{
struct rib_update_ctx *ctx;
@@ -4924,7 +4924,7 @@ void rib_update(enum rib_update_event event)
if (zebra_router_in_shutdown())
return;
- ctx = rib_update_ctx_init(0, event, ZEBRA_ROUTE_ALL);
+ ctx = rib_update_ctx_init(0, event, type);
event_add_event(zrouter.master, rib_update_handler, ctx, 0,
&t_rib_update_threads[event]);