Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

ripngd: Convert thread_cancel to THREAD_OFF 

Just convert all uses of thread_cancel to THREAD_OFF

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-06-03 10:38:59 -04:00
parent 546c8d78e7
commit 69ec2ecbea
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ripngd/ripng_interface.c
View File

@ -316,7 +316,7 @@ void ripng_interface_clean(struct ripng *ripng)
ri->enable_interface = 0; ri->enable_interface = 0;
ri->running = 0; ri->running = 0;
thread_cancel(&ri->t_wakeup); THREAD_OFF(ri->t_wakeup);
} }
} }

2
ripngd/ripng_peer.c
View File

@ -93,7 +93,7 @@ static struct ripng_peer *ripng_peer_get(struct ripng *ripng,
peer = ripng_peer_lookup(ripng, addr); peer = ripng_peer_lookup(ripng, addr);
if (peer) { if (peer) {
thread_cancel(&peer->t_timeout); THREAD_OFF(peer->t_timeout);
} else { } else {
peer = ripng_peer_new(); peer = ripng_peer_new();
peer->ripng = ripng; peer->ripng = ripng;

8
ripngd/ripngd.c
View File

@ -1445,7 +1445,7 @@ static void ripng_update(struct thread *t)
/* Triggered updates may be suppressed if a regular update is due by /* Triggered updates may be suppressed if a regular update is due by
the time the triggered update would be sent. */ the time the triggered update would be sent. */
thread_cancel(&ripng->t_triggered_interval); THREAD_OFF(ripng->t_triggered_interval);
ripng->trigger = 0; ripng->trigger = 0;
/* Reset flush event. */ /* Reset flush event. */
@ -1472,7 +1472,7 @@ void ripng_triggered_update(struct thread *t)
int interval; int interval;
/* Cancel interval timer. */ /* Cancel interval timer. */
thread_cancel(&ripng->t_triggered_interval); THREAD_OFF(ripng->t_triggered_interval);
ripng->trigger = 0; ripng->trigger = 0;
/* Logging triggered update. */ /* Logging triggered update. */
@ -1917,7 +1917,7 @@ void ripng_event(struct ripng *ripng, enum ripng_event event, int sock)
&ripng->t_read); &ripng->t_read);
break; break;
case RIPNG_UPDATE_EVENT: case RIPNG_UPDATE_EVENT:
thread_cancel(&ripng->t_update); THREAD_OFF(ripng->t_update);
/* Update timer jitter. */ /* Update timer jitter. */
jitter = ripng_update_jitter(ripng->update_time); jitter = ripng_update_jitter(ripng->update_time);
@ -2553,7 +2553,7 @@ static void ripng_instance_disable(struct ripng *ripng)
THREAD_OFF(ripng->t_triggered_interval); THREAD_OFF(ripng->t_triggered_interval);
/* Cancel the read thread */ /* Cancel the read thread */
thread_cancel(&ripng->t_read); THREAD_OFF(ripng->t_read);
/* Close the RIPng socket */ /* Close the RIPng socket */
if (ripng->sock >= 0) { if (ripng->sock >= 0) {