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 /vrrpd/vrrp.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'vrrpd/vrrp.c')
| -rw-r--r-- | vrrpd/vrrp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index 3081c0d955..4a0356411f 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -985,7 +985,7 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src, */ static void vrrp_read(struct thread *thread) { - struct vrrp_router *r = thread->arg; + struct vrrp_router *r = THREAD_ARG(thread); struct vrrp_pkt *pkt; ssize_t pktsize; @@ -1480,7 +1480,7 @@ static void vrrp_change_state(struct vrrp_router *r, int to) */ static void vrrp_adver_timer_expire(struct thread *thread) { - struct vrrp_router *r = thread->arg; + struct vrrp_router *r = THREAD_ARG(thread); DEBUGD(&vrrp_dbg_proto, VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM @@ -1508,7 +1508,7 @@ static void vrrp_adver_timer_expire(struct thread *thread) */ static void vrrp_master_down_timer_expire(struct thread *thread) { - struct vrrp_router *r = thread->arg; + struct vrrp_router *r = THREAD_ARG(thread); zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM "Master_Down_Timer expired", |