bgpd: Use THREAD_CANCEL instead of thread_cancel

We are crashing in thread_cancel on shutdown because
the thread pointer is NULL.  Use the more appropriate
THREAD_CANCEL macro

Ticket: CM-29873
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 037aeec28871f612334baf47cfb54fa9cba78ac2..d1c396a5bef9e3a3583f2930cee7ec5bf89dff2a 100644 (file)
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -909,7 +909,7 @@ void bgp_close(void)
        for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) {
                if (listener->bgp)
                        continue;
-               thread_cancel(listener->thread);
+               THREAD_OFF(listener->thread);
                close(listener->fd);
                listnode_delete(bm->listen_sockets, listener);
                XFREE(MTYPE_BGP_LISTENER, listener->name);