X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=zebra%2Fzebra_router.c;h=2e1c69fb9269af3cc29252e2b9577bd6a0b1c2e7;hb=91d227b7e3cb53ad8fdbcd9d4cff7f0a666918e3;hp=99d96fd67f44e75c152a143f2aeb70107fd3d8e7;hpb=75082dafb5a929b99d89c8f55e6b2da3f4d90100;p=mirror_frr.git

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index 99d96fd67..2e1c69fb9 100644
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -24,6 +24,7 @@
 #include "zebra_router.h"
 #include "zebra_memory.h"
 #include "zebra_pbr.h"
+#include "zebra_vxlan.h"
 
 struct zebra_router zrouter;
 
@@ -96,6 +97,7 @@ struct route_table *zebra_router_get_table(struct zebra_vrf *zvrf,
 	zrt = XCALLOC(MTYPE_ZEBRA_NS, sizeof(*zrt));
 	zrt->tableid = tableid;
 	zrt->afi = afi;
+	zrt->safi = safi;
 	zrt->ns_id = zvrf->zns->ns_id;
 	zrt->table =
 		(afi == AFI_IP6) ? srcdest_table_init() : route_table_init();
@@ -156,6 +158,7 @@ void zebra_router_terminate(void)
 		zebra_router_free_table(zrt);
 	}
 
+	zebra_vxlan_disable();
 	hash_clean(zrouter.rules_hash, zebra_pbr_rules_free);
 	hash_free(zrouter.rules_hash);
 
@@ -169,8 +172,7 @@ void zebra_router_terminate(void)
 
 void zebra_router_init(void)
 {
-	zrouter.l3vni_table = NULL;
-
+	zebra_vxlan_init();
 	zrouter.rules_hash = hash_create_size(8, zebra_pbr_rules_hash_key,
 					      zebra_pbr_rules_hash_equal,
 					      "Rules Hash");