From: Joakim Tjernlund Date: Wed, 14 Apr 2010 09:05:28 +0000 (+0200) Subject: ospfd: Make sure ospf_distribute_list_update_timer() eventually runs. X-Git-Tag: frr-2.0-rc1~2157 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=45acaa0a4cbb4b61c1e4cfcc8f8a534f4fdccfe5;p=mirror%2Ffrr.git ospfd: Make sure ospf_distribute_list_update_timer() eventually runs. * ospf_zebra.c: (ospf_distribute_list_update_timer) If there are updates to the distribute list every 5 second or less, ospf_distribute_list_update_timer() will never run as the timer gets rearmed for each update. This fixes it by never rearming an active distribute list timer. Signed-off-by: Joakim Tjernlund --- diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 90bee21513..462f67c819 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -972,9 +972,9 @@ ospf_distribute_list_update (struct ospf *ospf, int type) if (!(rt = EXTERNAL_INFO (type))) return; - /* If exists previously invoked thread, then cancel it. */ + /* If exists previously invoked thread, then let it continue. */ if (ospf->t_distribute_update) - OSPF_TIMER_OFF (ospf->t_distribute_update); + return; /* Set timer. */ ospf->t_distribute_update =