diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-05-16 20:13:40 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-05-16 20:13:40 +0200 |
| commit | 3ce3185a631e69786d5a0dbe882691023c10f38e (patch) | |
| tree | 96e3b3106770c330c73495c24fd25a63e1f415f9 /zebra/zebra_ns.c | |
| parent | Revert "zebra: keep rtadv_sock field in zrouter for optimisation" (diff) | |
| download | frr-3ce3185a631e69786d5a0dbe882691023c10f38e.tar.xz frr-3ce3185a631e69786d5a0dbe882691023c10f38e.zip | |
Revert "zebra: move rtadv service from zrouter to zvrf"
This reverts commit f20e2a09c8aef399698fa074b36f24becdf49cbb.
Diffstat (limited to 'zebra/zebra_ns.c')
| -rw-r--r-- | zebra/zebra_ns.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/zebra/zebra_ns.c b/zebra/zebra_ns.c index db4f9d001..0c743d867 100644 --- a/zebra/zebra_ns.c +++ b/zebra/zebra_ns.c @@ -27,6 +27,7 @@ #include "lib/prefix.h" #include "lib/memory.h" +#include "rtadv.h" #include "zebra_ns.h" #include "zebra_vrf.h" #include "zebra_memory.h" @@ -121,6 +122,10 @@ int zebra_ns_enable(ns_id_t ns_id, void **info) zns->ns_id = ns_id; +#if defined(HAVE_RTADV) + rtadv_init(zns); +#endif + kernel_init(zns); interface_list(zns); route_read(zns); @@ -137,6 +142,9 @@ int zebra_ns_enable(ns_id_t ns_id, void **info) static int zebra_ns_disable_internal(struct zebra_ns *zns, bool complete) { route_table_finish(zns->if_table); +#if defined(HAVE_RTADV) + rtadv_terminate(zns); +#endif kernel_terminate(zns, complete); |