From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 30 Aug 2017 11:49:51 +0000 (-0400)
Subject: pimd: Fix pim->keep_alive_time missed patch
X-Git-Tag: frr-4.0-dev~356^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1077%2Fhead;p=mirror%2Ffrr.git

pimd: Fix pim->keep_alive_time missed patch

The commit '19b807c pimd: Allow the keepalive time to be per vrf.'
is missing some data.  Probably as a result of the indentation
and I accidently dropped it.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 96b9568c61..0bf2ce5d56 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1364,7 +1364,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
 		pim_upstream_start_register_stop_timer(up, 1);
 
 		if (((up->channel_oil->cc.lastused / 100)
-		     > PIM_KEEPALIVE_PERIOD)
+		     > pim->keep_alive_time)
 		    && (I_am_RP(pim_ifp->pim, up->sg.grp))) {
 			if (PIM_DEBUG_TRACE)
 				zlog_debug(