ripd: 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/ripd/rip_interface.c b/ripd/rip_interface.c
index 7ac37b7ee2e8315df474ed3d1c869a03ec6c29e1..02da56e4f3ba454d7fd5554f39a893858c5c41d3 100644 (file)
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -428,7 +428,7 @@ static void rip_interface_clean(struct rip_interface *ri)
        ri->enable_interface = 0;
        ri->running = 0;
 
-       thread_cancel(&ri->t_wakeup);
+       THREAD_OFF(ri->t_wakeup);
 }
 
 void rip_interfaces_clean(struct rip *rip)

diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c
index d3cee3de2f3681b1ffacc42c83775a2fbf4d05df..a52914bcf9f908cb0913c8ba6c8d78ad3c555f92 100644 (file)
--- a/ripd/rip_peer.c
+++ b/ripd/rip_peer.c
@@ -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;

diff --git a/ripd/ripd.c b/ripd/ripd.c
index e1793b082b7085184ca6b1a8deb015a270fcf1f0..9798186036d9815f07824bab841606fa254ddb7d 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3526,7 +3526,7 @@ static void rip_instance_disable(struct rip *rip)
        THREAD_OFF(rip->t_triggered_interval);
 
        /* Cancel read thread. */
-       thread_cancel(&rip->t_read);
+       THREAD_OFF(rip->t_read);
 
        /* Close RIP socket. */
        close(rip->sock);