diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-30 13:49:51 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-30 13:49:51 +0200 |
| commit | 2f5b00289db5dd61386874bd9386f7c50cd97e94 (patch) | |
| tree | c005f0b5f3a6688d899a7156b35c92b1953a5f6d /pimd/pim_upstream.c | |
| parent | pimd: Add missed frame for vrf based interface (diff) | |
| download | frr-2f5b00289db5dd61386874bd9386f7c50cd97e94.tar.xz frr-2f5b00289db5dd61386874bd9386f7c50cd97e94.zip | |
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>
Diffstat (limited to 'pimd/pim_upstream.c')
| -rw-r--r-- | pimd/pim_upstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 96b9568c6..0bf2ce5d5 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( |