Merge pull request #5789 from donaldsharp/bgp_ebgp_reason

[mirror_frr.git] / zebra / zebra_router.c

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index e5319c64af031452f90c21d782f8143a1037b7b5..a891ffb76a2453c226039c7cb9e1f3a3ea3653c2 100644 (file)
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -29,7 +29,7 @@
 #include "zebra_pbr.h"
 #include "zebra_vxlan.h"
 #include "zebra_mlag.h"
-#include "zebra_nhg_private.h"
+#include "zebra_nhg.h"
 #include "debug.h"
 
 DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info")
@@ -223,7 +223,7 @@ void zebra_router_terminate(void)
        zebra_vxlan_disable();
        zebra_mlag_terminate();
 
-       hash_clean(zrouter.nhgs, zebra_nhg_free);
+       hash_clean(zrouter.nhgs, zebra_nhg_hash_free);
        hash_free(zrouter.nhgs);
        hash_clean(zrouter.nhgs_id, NULL);
        hash_free(zrouter.nhgs_id);
@@ -245,6 +245,8 @@ void zebra_router_init(void)
 
        zrouter.packets_to_process = ZEBRA_ZAPI_PACKETS_TO_PROCESS;
 
+       zrouter.rtadv_sock = -1;
+
        zebra_vxlan_init();
        zebra_mlag_init();