From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 18 Mar 2018 00:54:04 +0000 (-0400)
Subject: pimd: Just call the actual function
X-Git-Tag: frr-5.0-dev~97^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=78c16071f99bf3a5df1800a26656c3362eb0ba48;p=matthieu%2Ffrr.git

pimd: Just call the actual function

We do not really need a level of abstraction to call a particular function.
Just call it.

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

diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index dd77e2b084..134dbd8712 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -477,17 +477,6 @@ struct pim_neighbor *pim_neighbor_find_if(struct interface *ifp)
 	return listnode_head(pim_ifp->pim_neighbor_list);
 }
 
-/* rpf info associated with an upstream entry needs to be re-evaluated
- * when an RPF neighbor comes or goes */
-static void pim_neighbor_rpf_update(void)
-{
-	/* XXX: for the time being piggyback on the timer used on rib changes
-	 * to scan and update the rpf nexthop. This is expensive processing
-	 * and we should be able to optimize neighbor changes differently than
-	 * nexthop changes. */
-	sched_rpf_cache_refresh();
-}
-
 struct pim_neighbor *
 pim_neighbor_add(struct interface *ifp, struct in_addr source_addr,
 		 pim_hello_options hello_options, uint16_t holdtime,
@@ -556,7 +545,7 @@ pim_neighbor_add(struct interface *ifp, struct in_addr source_addr,
 
 	pim_rp_setup(pim_ifp->pim);
 
-	pim_neighbor_rpf_update();
+	sched_rpf_cache_refresh();
 	return neigh;
 }
 
@@ -678,7 +667,7 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh,
 
 	pim_neighbor_free(neigh);
 
-	pim_neighbor_rpf_update();
+	sched_rpf_cache_refresh();
 }
 
 void pim_neighbor_delete_all(struct interface *ifp, const char *delete_message)