2004-09-20 LIU Xin <lx at ns.6test.edu.cn>
* 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.
diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c
index b44d212..d7f3dfd 100644
--- a/isisd/isis_dr.c
+++ b/isisd/isis_dr.c
@@ -311,12 +311,10 @@
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)