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>

diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index 5159a9825bfe416f23892ebfe1aa1a957d5f7edc..3068d04b739c99606291c61c51b8a600acc7554a 100644 (file)
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -316,7 +316,7 @@ void ripng_interface_clean(struct ripng *ripng)
                ri->enable_interface = 0;
                ri->running = 0;
 
-               thread_cancel(&ri->t_wakeup);
+               THREAD_OFF(ri->t_wakeup);
        }
 }
 

diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c
index b22be39761db4c36ebc8fe8bf9e070e427a7c25c..37cfe9833fb722d9e274e197ab1526dbc46aedb4 100644 (file)
--- a/ripngd/ripng_peer.c
+++ b/ripngd/ripng_peer.c
@@ -93,7 +93,7 @@ static struct ripng_peer *ripng_peer_get(struct ripng *ripng,
        peer = ripng_peer_lookup(ripng, addr);
 
        if (peer) {
-               thread_cancel(&peer->t_timeout);
+               THREAD_OFF(peer->t_timeout);
        } else {
                peer = ripng_peer_new();
                peer->ripng = ripng;

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index a587d8c36d3b00654dbe3e2e55b9fc8304131c6a..1e7a13d7dc61e1f2d03a8257c37f1f8c13e3e936 100644 (file)
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -1445,7 +1445,7 @@ static void ripng_update(struct thread *t)
 
        /* Triggered updates may be suppressed if a regular update is due by
           the time the triggered update would be sent. */
-       thread_cancel(&ripng->t_triggered_interval);
+       THREAD_OFF(ripng->t_triggered_interval);
        ripng->trigger = 0;
 
        /* Reset flush event. */
@@ -1472,7 +1472,7 @@ void ripng_triggered_update(struct thread *t)
        int interval;
 
        /* Cancel interval timer. */
-       thread_cancel(&ripng->t_triggered_interval);
+       THREAD_OFF(ripng->t_triggered_interval);
        ripng->trigger = 0;
 
        /* Logging triggered update. */
@@ -1917,7 +1917,7 @@ void ripng_event(struct ripng *ripng, enum ripng_event event, int sock)
                                &ripng->t_read);
                break;
        case RIPNG_UPDATE_EVENT:
-               thread_cancel(&ripng->t_update);
+               THREAD_OFF(ripng->t_update);
 
                /* Update timer jitter. */
                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);
 
        /* Cancel the read thread */
-       thread_cancel(&ripng->t_read);
+       THREAD_OFF(ripng->t_read);
 
        /* Close the RIPng socket */
        if (ripng->sock >= 0) {