summaryrefslogtreecommitdiffstats
path: root/pimd/pimd.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-20 01:36:53 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:35 +0200
commit9b29ea95fc5b03de64cf9de55a89894deaed17e7 (patch)
tree65ca0f047472ea8b25e98063d479d434bc18e5e9 /pimd/pimd.c
parentpimd: pim_rp.c -> convert pimg to pim (diff)
downloadfrr-9b29ea95fc5b03de64cf9de55a89894deaed17e7.tar.xz
frr-9b29ea95fc5b03de64cf9de55a89894deaed17e7.zip
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/pimd.c')
-rw-r--r--pimd/pimd.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 64a16b098..91cf17d74 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -75,7 +75,7 @@ void pim_prefix_list_update(struct prefix_list *plist)
{
pim_rp_prefix_list_update(plist);
pim_ssm_prefix_list_update(plist);
- pim_upstream_spt_prefix_list_update(plist);
+ pim_upstream_spt_prefix_list_update(pimg, plist);
}
static void pim_free()
@@ -84,8 +84,6 @@ static void pim_free()
pim_oil_terminate();
- pim_upstream_terminate();
-
pim_if_terminate();
pim_rp_free();
@@ -113,8 +111,6 @@ void pim_init()
pim_oil_init();
- pim_upstream_init();
-
/*
RFC 4601: 4.6.3. Assert Metrics