5 files changed, 6 insertions, 6 deletions

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 2d69d4155a..5b3d0713ac 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -2646,7 +2646,7 @@ static void show_rpf_refresh_stats(struct vty *vty, struct pim_instance *pim,
 
 	if (json) {
 		json_object_int_add(json, "rpfCacheRefreshDelayMsecs",
-				    qpim_rpf_cache_refresh_delay_msec);
+				    router->rpf_cache_refresh_delay_msec);
 		json_object_int_add(
 			json, "rpfCacheRefreshTimer",
 			pim_time_timer_remain_msec(pim->rpf_cache_refresher));
@@ -2669,7 +2669,7 @@ static void show_rpf_refresh_stats(struct vty *vty, struct pim_instance *pim,
 			"RPF Cache Refresh Last:     %s\n"
 			"Nexthop Lookups:            %lld\n"
 			"Nexthop Lookups Avoided:    %lld\n",
-			qpim_rpf_cache_refresh_delay_msec,
+			router->rpf_cache_refresh_delay_msec,
 			pim_time_timer_remain_msec(pim->rpf_cache_refresher),
 			(long long)pim->rpf_cache_refresh_requests,
 			(long long)pim->rpf_cache_refresh_events,
diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h
index 9f36b9c304..f7b8e32af1 100644
--- a/pimd/pim_instance.h
+++ b/pimd/pim_instance.h
@@ -51,6 +51,7 @@ struct pim_router {
 
 	int t_periodic;
 	struct pim_assert_metric infinite_assert_metric;
+	long rpf_cache_refresh_delay_msec;
 };
 
 /* Per VRF PIM DB */
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 0524f74e3d..0753f99a9f 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -727,11 +727,11 @@ void sched_rpf_cache_refresh(struct pim_instance *pim)
 
 	if (PIM_DEBUG_ZEBRA) {
 		zlog_debug("%s: triggering %ld msec timer", __PRETTY_FUNCTION__,
-			   qpim_rpf_cache_refresh_delay_msec);
+			   router->rpf_cache_refresh_delay_msec);
 	}
 
 	thread_add_timer_msec(router->master, on_rpf_cache_refresh, pim,
-			      qpim_rpf_cache_refresh_delay_msec,
+			      router->rpf_cache_refresh_delay_msec,
 			      &pim->rpf_cache_refresher);
 }
 
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 2a37477fb9..81f5888cb2 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -51,7 +51,6 @@ DEFINE_MTYPE_STATIC(PIMD, ROUTER, "PIM Router information");
 
 struct pim_router *router = NULL;
 
-long qpim_rpf_cache_refresh_delay_msec = 50;
 int qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
 struct pim_instance *pimg = NULL;
 
@@ -103,6 +102,7 @@ void pim_router_init(void)
 	router->infinite_assert_metric.route_metric =
 		PIM_ASSERT_ROUTE_METRIC_MAX;
 	router->infinite_assert_metric.ip_address.s_addr = INADDR_ANY;
+	router->rpf_cache_refresh_delay_msec = 50;
 }
 
 void pim_router_terminate(void)
diff --git a/pimd/pimd.h b/pimd/pimd.h
index 2c13b5613d..d653c19f7e 100644
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -135,7 +135,6 @@ const char *const PIM_ALL_IGMP_ROUTERS;
 extern struct pim_router *router;
 extern struct zebra_privs_t pimd_privs;
 struct in_addr qpim_all_pim_routers_addr;
-long qpim_rpf_cache_refresh_delay_msec;
 extern int qpim_packet_process;
 extern uint8_t qpim_ecmp_enable;
 extern uint8_t qpim_ecmp_rebalance_enable;