From: Paul Jakma <paul@jakma.org>
Date: Tue, 15 Sep 2015 15:17:22 +0000 (+0100)
Subject: bgpd: Compile fix for clearing-completion FSM fix, using workqueue helper.
X-Git-Tag: frr-2.0-rc1~618
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b4575c00ced02228266a80e2b9b79b569e7760f3;p=mirror%2Ffrr.git

bgpd: Compile fix for clearing-completion FSM fix, using workqueue helper.

(cherry picked from commit 782fb0770080d0e2970fc63af8645e82543aa4d0)

Conflicts:
	bgpd/bgp_fsm.c
---

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);
     }