summaryrefslogtreecommitdiffstats
path: root/zebra/kernel_socket.c
diff options
context:
space:
mode:
authorKristof Provost <kprovost@netgate.com>2024-08-15 18:34:35 +0200
committerKristof Provost <kp@FreeBSD.org>2024-08-16 10:42:33 +0200
commitf0aa8d4f42acf5ef04346bd6289a50ec0f2a3d3f (patch)
treec2845b394dc571ca262991a66f32fbf1b0b2bc68 /zebra/kernel_socket.c
parentMerge pull request #16590 from donaldsharp/spelling_in_master (diff)
downloadfrr-f0aa8d4f42acf5ef04346bd6289a50ec0f2a3d3f.tar.xz
frr-f0aa8d4f42acf5ef04346bd6289a50ec0f2a3d3f.zip
zebra: fix loading kernel routs without netlink
Commit 605df8d44 zebra: Use zebra dplane for RTM link and addr broke loading of kernel routes at startup for configurations without netlink. It rearranged the startup sequence in zebra_ns_enable() to pass via zebra_ns_startup_continue(), triggered through zebra_dplane_startup_stage() calls. However, it neglected to make these calls in the non-netlink code path. As a result zebra failed to load kernel routes at startup on platforms such as FreeBSD. Insert these calls so we run through all of the expected startup stages. Signed-off-by: Kristof Provost <kprovost@netgate.com>
Diffstat (limited to '')
-rw-r--r--zebra/kernel_socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index d50e7de22..5cfbe7a89 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -1468,10 +1468,12 @@ static void routing_socket(struct zebra_ns *zns)
void interface_list_second(struct zebra_ns *zns)
{
+ zebra_dplane_startup_stage(zns, ZEBRA_DPLANE_ADDRESSES_READ);
}
void interface_list_tunneldump(struct zebra_ns *zns)
{
+ zebra_dplane_startup_stage(zns, ZEBRA_DPLANE_TUNNELS_READ);
}
/* Exported interface function. This function simply calls