]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #9471 from pguibert6WIND/table_manager_alloc2
authorRuss White <russ@riw.us>
Fri, 8 Oct 2021 17:49:54 +0000 (13:49 -0400)
committerGitHub <noreply@github.com>
Fri, 8 Oct 2021 17:49:54 +0000 (13:49 -0400)
zebra: extend table manager per vrf, add vty configuration

1  2 
doc/user/zebra.rst
zebra/zapi_msg.c
zebra/zebra_ns.c
zebra/zebra_vty.c

Simple merge
Simple merge
index 8ae677fb2289c8a1f5366177eb84d6cc2cee9bf8,0f53de8c31c9cdd6b009b32b67ffbd4322e1ec55..50e1d0f3892e97a94a945432e81187ddadd88699
@@@ -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;
Simple merge