From b4575c00ced02228266a80e2b9b79b569e7760f3 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Tue, 15 Sep 2015 16:17:22 +0100 Subject: [PATCH] bgpd: Compile fix for clearing-completion FSM fix, using workqueue helper. (cherry picked from commit 782fb0770080d0e2970fc63af8645e82543aa4d0) Conflicts: bgpd/bgp_fsm.c --- bgpd/bgp_fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index 2373bff104..9da21fdffd 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -940,7 +940,7 @@ bgp_fsm_change_status (struct peer *peer, int status) * the state change that happens below, so peer will be in Clearing * (or Deleted). */ - if (!peer->clear_node_queue->thread) + if (!work_queue_is_scheduled (peer->clear_node_queue)) BGP_EVENT_ADD (peer, Clearing_Completed); } -- 2.39.5