summaryrefslogtreecommitdiff
path: root/ldpd/interface.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 /ldpd/interface.c
parent0896b755080b300116d493444bfc05e2ef7ca9f6 (diff)
parentc94671b82f790492ceee226f98a65ad7e7e09967 (diff)
Merge pull request #408 from qlyoung/remove-thread-macros
*: remove THREAD_ON macros, add nullity check
Diffstat (limited to 'ldpd/interface.c')
-rw-r--r--ldpd/interface.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ldpd/interface.c b/ldpd/interface.c
index 440bb2dca0..a064a58b2e 100644
--- a/ldpd/interface.c
+++ b/ldpd/interface.c
@@ -440,8 +440,9 @@ static void
if_start_hello_timer(struct iface_af *ia)
{
THREAD_TIMER_OFF(ia->hello_timer);
- ia->hello_timer = thread_add_timer(master, if_hello_timer, ia,
- if_get_hello_interval(ia));
+ ia->hello_timer = NULL;
+ thread_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia),
+ &ia->hello_timer);
}
static void