diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-22 08:26:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 08:26:08 +0300 |
| commit | eed5b70f94b51c05bdbcebf39ade792213fd124b (patch) | |
| tree | 82932e6c0215ec11400b2b9e7efd911d7880d285 /ripd/rip_peer.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'ripd/rip_peer.c')
| -rw-r--r-- | ripd/rip_peer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index 8febb436e7..a52914bcf9 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -38,7 +38,7 @@ static struct rip_peer *rip_peer_new(void) static void rip_peer_free(struct rip_peer *peer) { - RIP_TIMER_OFF(peer->t_timeout); + THREAD_OFF(peer->t_timeout); XFREE(MTYPE_RIP_PEER, peer); } @@ -84,7 +84,7 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr) peer = rip_peer_lookup(rip, addr); if (peer) { - thread_cancel(&peer->t_timeout); + THREAD_OFF(peer->t_timeout); } else { peer = rip_peer_new(); peer->rip = rip; |