diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-10-14 19:15:09 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-10-14 19:15:09 +0200 |
| commit | 6a597223d3bb63602bcdb9aa840702f1850cadcc (patch) | |
| tree | 9f9aa64d9787973e9f67a0fcc84b90f2a3820af6 /pimd/pim_instance.c | |
| parent | Merge pull request #5141 from opensourcerouting/bfdd-fixes-bundle (diff) | |
| download | frr-6a597223d3bb63602bcdb9aa840702f1850cadcc.tar.xz frr-6a597223d3bb63602bcdb9aa840702f1850cadcc.zip | |
Revert "Merge pull request #4885 from satheeshkarra/pim_mlag"
This reverts commit d563896dada99f3474d428f928786cbfde936fee, reversing
changes made to 09ea1a40386f02a13cdb0462cc55af0d03f0c277.
Diffstat (limited to 'pimd/pim_instance.c')
| -rw-r--r-- | pimd/pim_instance.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index 955ad14b0..6848d2dab 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -34,7 +34,6 @@ #include "pim_ssmpingd.h" #include "pim_vty.h" #include "pim_bsm.h" -#include "pim_mlag.h" static void pim_instance_terminate(struct pim_instance *pim) { @@ -48,8 +47,6 @@ static void pim_instance_terminate(struct pim_instance *pim) if (pim->static_routes) list_delete(&pim->static_routes); - pim_instance_mlag_terminate(pim); - pim_upstream_terminate(pim); pim_rp_free(pim); @@ -118,8 +115,6 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf) pim_upstream_init(pim); - pim_instance_mlag_init(pim); - pim->last_route_change_time = -1; return pim; } |