summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave LeRoy <dleroy@labn.net>2024-05-31 10:05:10 -0700
committerJafar Al-Gharaibeh <jafar@atcorp.com>2024-06-05 16:31:54 -0500
commit0d9296b802c10e0133824a0908142d074d75c3fd (patch)
treeaff547d672893a7cc46b74c8bceacca9f76b92b8
parent3405d015d9414c71b19bccc9e3a693fadc2fa108 (diff)
nhrpd: core dump on shutdown backport fix
This fixes a merge conflict encountered when backporting PR 15879 Signed-off-by: Dave LeRoy <dleroy@labn.net>
-rw-r--r--nhrpd/nhrp_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index bece89ca79..5515b45f39 100644
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -87,13 +87,13 @@ static void nhrp_request_stop(void)
debugf(NHRP_DEBUG_COMMON, "Exiting...");
frr_early_fini();
- nhrp_shortcut_terminate();
+ vrf_terminate();
nhrp_nhs_terminate();
nhrp_zebra_terminate();
vici_terminate();
evmgr_terminate();
nhrp_vc_terminate();
- vrf_terminate();
+ nhrp_shortcut_terminate();
debugf(NHRP_DEBUG_COMMON, "Done.");
frr_fini();