diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2024-02-08 17:49:08 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2024-02-08 17:49:08 +0100 |
| commit | b9130ab51b58a87d1c1b0d4e0cab072df1357a4d (patch) | |
| tree | 568645cb530d0ba97d6faa93b8650ed88a5b2a07 | |
| parent | zebra: Installation success should not set NHG as valid (diff) | |
| download | frr-b9130ab51b58a87d1c1b0d4e0cab072df1357a4d.tar.xz frr-b9130ab51b58a87d1c1b0d4e0cab072df1357a4d.zip | |
zebra: Remove helper function if_nhg_dependents_is_empty
Let's just let the function figure this out.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
| -rw-r--r-- | zebra/interface.c | 12 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 15 |
2 files changed, 8 insertions, 19 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index 6624eb259..829f9dab6 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -983,18 +983,6 @@ unsigned int if_nhg_dependents_count(const struct interface *ifp) return 0; } - -bool if_nhg_dependents_is_empty(const struct interface *ifp) -{ - if (ifp->info) { - struct zebra_if *zif = (struct zebra_if *)ifp->info; - - return nhg_connected_tree_is_empty(&zif->nhg_dependents); - } - - return false; -} - /* Interface is up. */ void if_up(struct interface *ifp, bool install_connected) { diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 70b71fe70..422acf083 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1476,17 +1476,18 @@ static void if_nexthop_group_dump_vty(struct vty *vty, struct interface *ifp) { struct zebra_if *zebra_if = NULL; struct nhg_connected *rb_node_dep = NULL; + bool first = true; zebra_if = ifp->info; - if (!if_nhg_dependents_is_empty(ifp)) { - vty_out(vty, "Interface %s:\n", ifp->name); - - frr_each(nhg_connected_tree, &zebra_if->nhg_dependents, - rb_node_dep) { - vty_out(vty, " "); - show_nexthop_group_out(vty, rb_node_dep->nhe, NULL); + frr_each (nhg_connected_tree, &zebra_if->nhg_dependents, rb_node_dep) { + if (first) { + vty_out(vty, "Interface %s:\n", ifp->name); + first = false; } + + vty_out(vty, " "); + show_nexthop_group_out(vty, rb_node_dep->nhe, NULL); } } |