From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 20 May 2017 17:57:34 +0000 (-0400)
Subject: pimd: Remove pimg from pim_iface.c
X-Git-Tag: frr-4.0-dev~468^2~111
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5ec5d976ebb264b984b10a7a9d44d66c76d936c0;p=mirror%2Ffrr.git

pimd: Remove pimg from pim_iface.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 43f8c08b42..0b8ab24ce7 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -838,6 +838,8 @@ void pim_if_addr_del_all(struct interface *ifp)
 	struct connected *ifc;
 	struct listnode *node;
 	struct listnode *nextnode;
+	struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
+	struct pim_instance *pim = vrf->info;
 
 	/* PIM/IGMP enabled ? */
 	if (!ifp->info)
@@ -852,8 +854,8 @@ void pim_if_addr_del_all(struct interface *ifp)
 		pim_if_addr_del(ifc, 1 /* force_prim_as_any=true */);
 	}
 
-	pim_rp_setup(pimg);
-	pim_i_am_rp_re_evaluate(pimg);
+	pim_rp_setup(pim);
+	pim_i_am_rp_re_evaluate(pim);
 }
 
 void pim_if_addr_del_all_igmp(struct interface *ifp)