diff options
| author | Russ White <russ@riw.us> | 2017-05-10 13:51:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 13:51:47 -0400 |
| commit | 00a1578051ceeb26b0b9c2c3344cac1f202e047d (patch) | |
| tree | 248b55b1ab56e39025d9902c53564286558eda60 /zebra/label_manager.c | |
| parent | 0896b755080b300116d493444bfc05e2ef7ca9f6 (diff) | |
| parent | c94671b82f790492ceee226f98a65ad7e7e09967 (diff) | |
Merge pull request #408 from qlyoung/remove-thread-macros
*: remove THREAD_ON macros, add nullity check
Diffstat (limited to 'zebra/label_manager.c')
| -rw-r--r-- | zebra/label_manager.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c index bf67141cd4..f7d2dce8f3 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -141,9 +141,8 @@ static int zclient_connect(struct thread *t) if (zclient_socket_connect(zclient) < 0) { zlog_err("Error connecting synchronous zclient!"); - THREAD_TIMER_ON(zebrad.master, zclient->t_connect, - zclient_connect, - zclient, CONNECTION_DELAY); + thread_add_timer(zebrad.master, zclient_connect, zclient, + CONNECTION_DELAY, &zclient->t_connect); return -1; } |