summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bgpd/bgp_bfd.c2
-rw-r--r--bgpd/bgp_packet.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index 7e1d64056d..11e9344d1c 100644
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -598,6 +598,7 @@ static int bgp_bfd_peer_param_type_set(struct peer *peer,
return 0;
}
+#if HAVE_BFDD > 0
/**
* Set peer BFD profile configuration.
*/
@@ -652,6 +653,7 @@ static int bgp_bfd_peer_set_profile(struct peer *peer, const char *profile)
return 0;
}
+#endif
/*
* bgp_bfd_peer_config_write - Write the peer BFD configuration.
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 2ebac56670..d75d032c5c 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -403,12 +403,13 @@ int bgp_generate_updgrp_packets(struct thread *thread)
/*
* The code beyond this part deals with update packets, proceed only
* if peer is Established and updates are not on hold (as part of
- * update-delay post processing).
+ * update-delay processing).
*/
if (peer->status != Established)
return 0;
- if (peer->bgp->main_peers_update_hold)
+ if ((peer->bgp->main_peers_update_hold)
+ || bgp_update_delay_active(peer->bgp))
return 0;
if (peer->t_routeadv)