diff options
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 01b3898a..a44d47ab 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1562,6 +1562,7 @@ bgp_processq_del (struct work_queue *wq, void *data) { struct bgp_process_queue *pq = data; + bgp_unlock(pq->bgp); bgp_unlock_node (pq->rn); XFREE (MTYPE_BGP_PROCESS_QUEUE, pq); } @@ -1611,6 +1612,7 @@ bgp_process (struct bgp *bgp, struct bgp_node *rn, afi_t afi, safi_t safi) pqnode->rn = bgp_lock_node (rn); /* unlocked by bgp_processq_del */ pqnode->bgp = bgp; + bgp_lock(bgp); pqnode->afi = afi; pqnode->safi = safi; @@ -2843,19 +2845,6 @@ bgp_clear_route (struct peer *peer, afi_t afi, safi_t safi) */ if (!peer->clear_node_queue->thread) bgp_clear_node_complete (peer->clear_node_queue); - else - { - /* clearing queue scheduled. Normal if in Established state - * (and about to transition out of it), but otherwise... - */ - if (peer->status != Established) - { - plog_err (peer->log, "%s [Error] State %s is not Established," - " but routes were cleared - bug!", - peer->host, LOOKUP (bgp_status_msg, peer->status)); - assert (peer->status == Established); - } - } } void |