Merge pull request #10063 from idryzhov/ospf-gr-guarded-code

ospfd: fix code being guarded by debug check
This commit is contained in:
Donald Sharp 2021-11-15 15:08:26 -05:00 committed by GitHub
commit f22a74fee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -76,10 +76,11 @@ static int ospf_inactivity_timer(struct thread *thread)
*/
if (!OSPF_GR_IS_ACTIVE_HELPER(nbr))
OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_InactivityTimer);
else if (IS_DEBUG_OSPF_GR) {
zlog_debug(
"%s, Acting as HELPER for this neighbour, So restart the dead timer",
__func__);
else {
if (IS_DEBUG_OSPF_GR)
zlog_debug(
"%s, Acting as HELPER for this neighbour, So restart the dead timer",
__func__);
OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer,
nbr->v_inactivity);
}