From a211d65dfda5ae4028ec7bb524f85f3f4bae24c2 Mon Sep 17 00:00:00 2001 From: hasso Date: Mon, 20 Sep 2004 14:55:29 +0000 Subject: 2004-09-20 LIU Xin * isis_dr.c, isis_events.c: Remove hello multiplier usage while scheduling DIS election. * isis_pdu.c: Don't call isis_event_dis_status_change() whenever l[1|2]_desig_is is different from hdr.lan_id. --- isisd/isis_dr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'isisd/isis_dr.c') diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index b44d2123..d7f3dfdc 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -311,12 +311,10 @@ isis_dr_commence (struct isis_circuit *circuit, int level) circuit->u.bc.run_dr_elect[level - 1] = 0; if (level == 1) THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[0], isis_run_dr_l1, - circuit, 2 * circuit->hello_multiplier[0] * - circuit->hello_interval[0]); + circuit, 2 * circuit->hello_interval[0]); else THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[1], isis_run_dr_l2, - circuit, 2 * circuit->hello_multiplier[1] * - circuit->hello_interval[1]); + circuit, 2 * circuit->hello_interval[1]); circuit->u.bc.is_dr[level - 1] = 1; if (level == 1) -- cgit v1.2.3