summaryrefslogtreecommitdiff
path: root/pimd/pim_instance.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-19 19:36:53 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 13:51:35 -0400
commit9b29ea95fc5b03de64cf9de55a89894deaed17e7 (patch)
tree65ca0f047472ea8b25e98063d479d434bc18e5e9 /pimd/pim_instance.c
parentfec883d95a64c37a9d0cb728085c816ff7188874 (diff)
pimd: Remove pimg from pim_upstream.c
Move the upstream_list, hash and wheel into 'struct pim_instance' Remove all pimg to pim in pim_upstream Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_instance.c')
-rw-r--r--pimd/pim_instance.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 84fc9b9252..c2ca20d818 100644
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -48,6 +48,8 @@ static void pim_instance_terminate(struct pim_instance *pim)
if (pim->static_routes)
list_free(pim->static_routes);
+ pim_upstream_terminate(pim);
+
XFREE(MTYPE_PIM_PIM_INSTANCE, pimg);
}
@@ -93,6 +95,7 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf)
pim_mroute_socket_enable(pim);
+ pim_upstream_init(pim);
return pim;
}