diff options
| -rw-r--r-- | bfdd/bfdd_vty.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_nb_config.c | 3 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c index a3f1638e5f..837a7b7d7d 100644 --- a/bfdd/bfdd_vty.c +++ b/bfdd/bfdd_vty.c @@ -447,7 +447,7 @@ static void _display_peers_counter(struct vty *vty, char *vrfname, bool use_json jo = json_object_new_array(); bvt.jo = jo; - bfd_id_iterate(_display_peer_counter_json_iter, jo); + bfd_id_iterate(_display_peer_counter_json_iter, &bvt); vty_out(vty, "%s\n", json_object_to_json_string_ext(jo, 0)); json_object_free(jo); diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c index d2eb4a48e6..eca7093fcd 100644 --- a/bgpd/bgp_nb_config.c +++ b/bgpd/bgp_nb_config.c @@ -6289,11 +6289,10 @@ int bgp_neighbors_unnumbered_neighbor_afi_safis_afi_safi_enabled_destroy( static struct peer *bgp_peer_group_peer_lookup(struct bgp *bgp, const char *peer_str) { - struct peer *peer = NULL; struct peer_group *group = NULL; group = peer_group_lookup(bgp, peer_str); - return peer = group->conf; + return group->conf; } /* diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 8a237e329e..f8a29821d8 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2934,7 +2934,8 @@ int bgp_best_path_select_defer(struct bgp *bgp, afi_t afi, safi_t safi) } /* Process the route list */ - for (dest = bgp_table_top(bgp->rib[afi][safi]); dest; + for (dest = bgp_table_top(bgp->rib[afi][safi]); + dest && bgp->gr_info[afi][safi].gr_deferred != 0; dest = bgp_route_next(dest)) { if (!CHECK_FLAG(dest->flags, BGP_NODE_SELECT_DEFER)) continue; @@ -2950,7 +2951,7 @@ int bgp_best_path_select_defer(struct bgp *bgp, afi_t afi, safi_t safi) } /* Send EOR message when all routes are processed */ - if (bgp->gr_info[afi][safi].gr_deferred) { + if (!bgp->gr_info[afi][safi].gr_deferred) { bgp_send_delayed_eor(bgp); /* Send route processing complete message to RIB */ bgp_zebra_update(afi, safi, bgp->vrf_id, |