From b2365558519599f35e13d0b6148bb1ebef1b7d68 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 20 May 2017 13:48:26 -0400 Subject: [PATCH] pimd: Cleanup pim_jp_agg_upstream_verification function Do not use pimg, figure out which instance we are in and use that. Signed-off-by: Donald Sharp --- pimd/pim_jp_agg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pimd/pim_jp_agg.c b/pimd/pim_jp_agg.c index a4c1bf1366..a00bed064f 100644 --- a/pimd/pim_jp_agg.c +++ b/pimd/pim_jp_agg.c @@ -215,9 +215,11 @@ void pim_jp_agg_upstream_verification(struct pim_upstream *up, bool ignore) #ifdef PIM_JP_AGG_DEBUG struct listnode *node; struct interface *ifp; + struct pim_interface *pim_ifp = up->rpf.source_nexthop.interface->info; + struct pim_instance *pim = pim_ifp->pim; - for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) { - struct pim_interface *pim_ifp = ifp->info; + for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pim->vrf_id), node, ifp)) { + pim_ifp = ifp->info; struct listnode *nnode; if (ignore && ifp == up->rpf.source_nexthop.interface) -- 2.39.5