From 9fb3006d10c38f7337a705e82dd36bd3a963fa39 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 13 May 2009 15:30:08 -0700 Subject: Revert "Wait for peers to clear on BGP shutdown" This reverts commit 732ebcdfad6e3a786386e38a126c84477d192105. --- bgpd/bgp_route.c | 12 ------------ bgpd/bgp_route.h | 1 - bgpd/bgpd.c | 2 -- 3 files changed, 15 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 4e172bf8..6da17d9b 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2670,18 +2670,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) diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h index 02193ba9..3e65bb10 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -171,7 +171,6 @@ extern void bgp_soft_reconfig_rsclient (struct peer *, afi_t, safi_t); extern void bgp_check_local_routes_rsclient (struct peer *rsclient, afi_t afi, safi_t safi); extern void bgp_clear_route (struct peer *, afi_t, safi_t); extern void bgp_clear_route_all (struct peer *); -extern void bgp_clear_route_wait (struct peer *); extern void bgp_clear_adj_in (struct peer *, afi_t, safi_t); extern void bgp_clear_stale_route (struct peer *, afi_t, safi_t); diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index af2f15e4..f1d78389 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1133,8 +1133,6 @@ peer_delete (struct peer *peer) bgp_timer_set (peer); /* stops all timers for Deleted */ - bgp_clear_route_wait (peer); - /* Delete from all peer list. */ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP)) { -- cgit v1.2.3