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 /ripd/rip_interface.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 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index a4ee2ba570..57c49c6313 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -1011,9 +1011,8 @@ rip_enable_apply (struct interface *ifp) zlog_debug ("turn on %s", ifp->name); /* Add interface wake up thread. */ - if (! ri->t_wakeup) - ri->t_wakeup = thread_add_timer (master, rip_interface_wakeup, - ifp, 1); + thread_add_timer(master, rip_interface_wakeup, ifp, 1, + &ri->t_wakeup); rip_connect_set (ifp, 1); } } |
