diff options
| -rw-r--r-- | bgpd/bgp_route.c | 12 | ||||
| -rw-r--r-- | zebra/zebra_nb_state.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 78f077eaca..e8151d94ed 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -10567,8 +10567,8 @@ DEFUN(show_ip_bgp_statistics_all, show_ip_bgp_statistics_all_cmd, { bool uj = use_json(argc, argv); struct bgp *bgp = NULL; - safi_t safi; - afi_t afi; + safi_t safi = SAFI_UNICAST; + afi_t afi = AFI_IP6; int idx = 0; struct json_object *json_all = NULL; struct json_object *json_afi_safi = NULL; @@ -10626,8 +10626,8 @@ DEFUN (show_ip_bgp_l2vpn_evpn_statistics, "BGP RIB advertisement statistics\n" JSON_STR) { - afi_t afi; - safi_t safi; + afi_t afi = AFI_IP6; + safi_t safi = SAFI_UNICAST; struct bgp *bgp = NULL; int idx = 0, ret; bool uj = use_json(argc, argv); @@ -10666,8 +10666,8 @@ DEFUN(show_ip_bgp_afi_safi_statistics, show_ip_bgp_afi_safi_statistics_cmd, BGP_SAFI_WITH_LABEL_HELP_STR "BGP RIB advertisement statistics\n" JSON_STR) { - afi_t afi; - safi_t safi; + afi_t afi = AFI_IP6; + safi_t safi = SAFI_UNICAST; struct bgp *bgp = NULL; int idx = 0, ret; bool uj = use_json(argc, argv); diff --git a/zebra/zebra_nb_state.c b/zebra/zebra_nb_state.c index 415c0d3f6d..44a2d172f1 100644 --- a/zebra/zebra_nb_state.c +++ b/zebra/zebra_nb_state.c @@ -490,7 +490,7 @@ const void *lib_vrf_zebra_ribs_rib_route_route_entry_nexthop_group_get_next( struct route_entry *re = (struct route_entry *)args->parent_list_entry; struct nhg_hash_entry *nhe = (struct nhg_hash_entry *)args->list_entry; - if (args->list_entry == NULL) { + if (nhe == NULL) { nhe = re->nhe; return nhe; } |