From: Russ White <russ@riw.us>
Date: Fri, 8 Oct 2021 17:49:54 +0000 (-0400)
Subject: Merge pull request #9471 from pguibert6WIND/table_manager_alloc2
X-Git-Tag: base_8.2~355
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=99497bc4ee5c8324444998310cd211425d9bb10c;p=matthieu%2Ffrr.git

Merge pull request #9471 from pguibert6WIND/table_manager_alloc2

zebra: extend table manager per vrf, add vty configuration
---

99497bc4ee5c8324444998310cd211425d9bb10c
diff --cc zebra/zebra_ns.c
index 8ae677fb22,0f53de8c31..50e1d0f389
--- a/zebra/zebra_ns.c
+++ b/zebra/zebra_ns.c
@@@ -141,12 -137,8 +138,10 @@@ static int zebra_ns_disable_internal(st
  {
  	route_table_finish(zns->if_table);
  
 +	zebra_dplane_ns_enable(zns, false /*Disable*/);
 +
  	kernel_terminate(zns, complete);
  
- 	table_manager_disable(zns->ns_id);
- 
  	zns->ns_id = NS_DEFAULT;
  
  	return 0;