From 0a5e562a656ed791156bb6b1139e0a5ac1f8ebb4 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Tue, 6 Nov 2018 20:37:24 +0100 Subject: [PATCH] isisd: Move dr election timer to the end of isis_dr_commence Signed-off-by: Christian Franke --- isisd/isis_dr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index b2ec8ae594..449648656a 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -270,10 +270,6 @@ int isis_dr_commence(struct isis_circuit *circuit, int level) /* Lets keep a pause in DR election */ circuit->u.bc.run_dr_elect[level - 1] = 0; - thread_add_timer(master, isis_run_dr, - &circuit->level_arg[level - 1], - 2 * circuit->hello_interval[level - 1], - &circuit->u.bc.t_run_dr[level - 1]); circuit->u.bc.is_dr[level - 1] = 1; if (level == 1) { @@ -319,6 +315,10 @@ int isis_dr_commence(struct isis_circuit *circuit, int level) &circuit->t_send_csnp[1]); } + thread_add_timer(master, isis_run_dr, + &circuit->level_arg[level - 1], + 2 * circuit->hello_interval[level - 1], + &circuit->u.bc.t_run_dr[level - 1]); thread_add_event(master, isis_event_dis_status_change, circuit, 0, NULL); -- 2.39.5