diff options
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 4e172bf8..80ae0793 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1529,6 +1529,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); } @@ -1578,6 +1579,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; @@ -2670,18 +2672,6 @@ bgp_clear_node_queue_init (struct peer *peer) peer->clear_node_queue->spec.data = peer; } -/* Route clearing may not be done yet. - * Otherwise events in peer->clear_node_queue could happen after bgp is freed. - */ -void -bgp_clear_route_wait (struct peer *peer) -{ - struct work_queue *wq = peer->clear_node_queue; - - while (listcount (wq->items) > 0) - work_queue_run(wq->thread); -} - static void bgp_clear_route_table (struct peer *peer, afi_t afi, safi_t safi, struct bgp_table *table, struct peer *rsclient) |