]> git.puffer.fish Git - matthieu/frr.git/commitdiff
nhrpd: core dump on shutdown backport fix
authorDave LeRoy <dleroy@labn.net>
Fri, 31 May 2024 17:05:10 +0000 (10:05 -0700)
committerJafar Al-Gharaibeh <jafar@atcorp.com>
Wed, 5 Jun 2024 21:24:41 +0000 (16:24 -0500)
This fixes a merge conflict encountered when backporting PR 15879

Signed-off-by: Dave LeRoy <dleroy@labn.net>
nhrpd/nhrp_main.c

index bece89ca79b4359bd21e8b0abe26167d7e209039..5515b45f39427b1e0160fe50fb8ed8b2715856c2 100644 (file)
@@ -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();