From f6a53d1fbf8636c6babcb41ce2490ca2106b533a Mon Sep 17 00:00:00 2001 From: Dave LeRoy Date: Fri, 31 May 2024 10:05:10 -0700 Subject: [PATCH] nhrpd: core dump on shutdown backport fix This fixes a merge conflict encountered when backporting PR 15879 Signed-off-by: Dave LeRoy --- nhrpd/nhrp_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 593498ca13..6489a66d7b 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -83,13 +83,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(); -- 2.39.5