summaryrefslogtreecommitdiff
path: root/ospf6d/ospf6_spf.c
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2017-05-10 13:51:47 -0400
committerGitHub <noreply@github.com>2017-05-10 13:51:47 -0400
commit00a1578051ceeb26b0b9c2c3344cac1f202e047d (patch)
tree248b55b1ab56e39025d9902c53564286558eda60 /ospf6d/ospf6_spf.c
parent0896b755080b300116d493444bfc05e2ef7ca9f6 (diff)
parentc94671b82f790492ceee226f98a65ad7e7e09967 (diff)
Merge pull request #408 from qlyoung/remove-thread-macros
*: remove THREAD_ON macros, add nullity check
Diffstat (limited to 'ospf6d/ospf6_spf.c')
-rw-r--r--ospf6d/ospf6_spf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 333ce5588e..6a10ba7ad5 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -727,8 +727,9 @@ ospf6_spf_schedule (struct ospf6 *ospf6, unsigned int reason)
zlog_info ("SPF: Scheduled in %ld msec", delay);
- ospf6->t_spf_calc =
- thread_add_timer_msec (master, ospf6_spf_calculation_thread, ospf6, delay);
+ ospf6->t_spf_calc = NULL;
+ thread_add_timer_msec(master, ospf6_spf_calculation_thread, ospf6, delay,
+ &ospf6->t_spf_calc);
}
void