]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: Compile fix for clearing-completion FSM fix, using workqueue helper.
authorPaul Jakma <paul@jakma.org>
Tue, 15 Sep 2015 15:17:22 +0000 (16:17 +0100)
committervivek <vivek@cumulusnetworks.com>
Mon, 6 Jun 2016 16:10:39 +0000 (09:10 -0700)
(cherry picked from commit 782fb0770080d0e2970fc63af8645e82543aa4d0)

Conflicts:
bgpd/bgp_fsm.c

bgpd/bgp_fsm.c

index 2373bff104fa2b3e41f33e94da82115c02308574..9da21fdffda984cd66138db6c0235a5d46f885a8 100644 (file)
@@ -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);
     }