]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Fix pim->keep_alive_time missed patch 1077/head
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 30 Aug 2017 11:49:51 +0000 (07:49 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 30 Aug 2017 11:49:51 +0000 (07:49 -0400)
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>
pimd/pim_upstream.c

index 96b9568c61cd426c8eaa51a9c595b0eff7c3d480..0bf2ce5d562e46f3523b566180a4424d93ea7368 100644 (file)
@@ -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(