diff options
Diffstat (limited to 'pimd/pim_upstream.c')
| -rw-r--r-- | pimd/pim_upstream.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index c79e85cd0f..673c56ea5d 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -536,7 +536,8 @@ void pim_upstream_register_reevaluate(struct pim_instance *pim) * is actually active; if it is not kat setup will trigger * source * registration whenever the flow becomes active. */ - if (!PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) || !up->t_ka_timer) + if (!PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) || + !pim_upstream_is_kat_running(up)) continue; if (pim_is_grp_ssm(pim, up->sg.grp)) { @@ -1046,11 +1047,6 @@ static bool pim_upstream_empty_immediate_olist(struct pim_instance *pim, return true; } -static bool pim_upstream_is_kat_running(struct pim_upstream *up) -{ - return (up->t_ka_timer != NULL); -} - /* * bool JoinDesired(*,G) { * if (immediate_olist(*,G) != NULL) |