From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 20 May 2015 01:03:59 +0000 (-0700)
Subject: During update-delay, route withdraws to zebra should not be kept on hold,
X-Git-Tag: frr-2.0-rc1~1435
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b7250fa012b62bdc01d885e5de245ed886bf7eb3;p=mirror%2Ffrr.git

During update-delay, route withdraws to zebra should not be kept on hold,
because BGP may have pending withdraws from the peers going phase.
---

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index ed41c39bee..ce2dc15612 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1325,9 +1325,6 @@ bgp_zebra_withdraw (struct prefix *p, struct bgp_info *info, safi_t safi)
 
   peer = info->peer;
 
-  if (peer->bgp && peer->bgp->main_zebra_update_hold)
-    return;
-
   flags = 0;
 
   if (peer->sort == BGP_PEER_IBGP)