Merge pull request #3428 from pguibert6WIND/avoid_vni_overwrite

zebra: avoid initialising more than one the l3vni hash structure

1 files changed, 3 insertions, 2 deletions

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index afe3c708a0..2e1c69fb92 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;
 
@@ -157,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);
 
@@ -170,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");