diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2019-01-04 14:20:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 14:20:22 -0500 |
| commit | e4587bc559f863428b3380648e3ab157eb31dee8 (patch) | |
| tree | c73358f4ca7f89cc10f91c0a74af7c626cd98972 /pimd/pim_instance.c | |
| parent | c05f659a58466dd1a8dfe2a2ebbefeeb0b9c8ee0 (diff) | |
| parent | afec9bba1ed56a4157f9fa413e0b44a4cc660377 (diff) | |
Merge pull request #3529 from donaldsharp/some_integration
Cleanup of some PIM, very early start of MLAG integration info zebra
Diffstat (limited to 'pimd/pim_instance.c')
| -rw-r--r-- | pimd/pim_instance.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index b0d7a7b2db..092a2d76fa 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -85,7 +85,7 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf) pim->spt.switchover = PIM_SPT_IMMEDIATE; pim->spt.plist = NULL; - pim_msdp_init(pim, master); + pim_msdp_init(pim, router->master); snprintf(hash_name, 64, "PIM %s RPF Hash", vrf->name); pim->rpf_hash = hash_create_size(256, pim_rpf_hash_key, pim_rpf_equal, @@ -101,9 +101,6 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf) pim->send_v6_secondary = 1; - if (vrf->vrf_id == VRF_DEFAULT) - pimg = pim; - pim_rp_init(pim); pim_oil_init(pim); @@ -132,9 +129,6 @@ static int pim_vrf_new(struct vrf *vrf) vrf->info = (void *)pim; - if (vrf->vrf_id == VRF_DEFAULT) - pimg = pim; - pim_ssmpingd_init(pim); return 0; } |