diff options
| author | Russ White <russ@riw.us> | 2021-10-27 21:29:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 21:29:39 +0200 |
| commit | f727c6ae8a62be99bd5be5a191fbd7df455a35f0 (patch) | |
| tree | 9e9bde7f79993485caf03678351041c05379a81e /lib | |
| parent | Merge pull request #9902 from LabNConsulting/working/lb/lutil-wait-optimization (diff) | |
| parent | lib: make if_lookup_by_name_all_vrf internal (diff) | |
| download | frr-f727c6ae8a62be99bd5be5a191fbd7df455a35f0.tar.xz frr-f727c6ae8a62be99bd5be5a191fbd7df455a35f0.zip | |
Merge pull request #9837 from idryzhov/cleanup-if-by-name-vrf-all
*: fix usage of if_lookup_by_name_all_vrf
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/if.c | 2 | ||||
| -rw-r--r-- | lib/if.h | 1 | ||||
| -rw-r--r-- | lib/nexthop_group.c | 7 |
3 files changed, 1 insertions, 9 deletions
@@ -423,7 +423,7 @@ struct interface *if_lookup_by_name_vrf(const char *name, struct vrf *vrf) return RB_FIND(if_name_head, &vrf->ifaces_by_name, &if_tmp); } -struct interface *if_lookup_by_name_all_vrf(const char *name) +static struct interface *if_lookup_by_name_all_vrf(const char *name) { struct vrf *vrf; struct interface *ifp; @@ -526,7 +526,6 @@ size_t if_lookup_by_hwaddr(const uint8_t *hw_addr, size_t addrsz, struct interface ***result, vrf_id_t vrf_id); struct vrf; -extern struct interface *if_lookup_by_name_all_vrf(const char *ifname); extern struct interface *if_lookup_by_name_vrf(const char *name, struct vrf *vrf); extern struct interface *if_lookup_by_name(const char *ifname, vrf_id_t vrf_id); extern struct interface *if_get_by_name(const char *ifname, vrf_id_t vrf_id, diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c index 97d70189f..af9cd2d79 100644 --- a/lib/nexthop_group.c +++ b/lib/nexthop_group.c @@ -953,12 +953,6 @@ DEFPY(ecmp_nexthops, ecmp_nexthops_cmd, nhg_hooks.add_nexthop(nhgc, nh); } - if (intf) { - struct interface *ifp = if_lookup_by_name_all_vrf(intf); - - if (ifp) - ifp->configured = true; - } return CMD_SUCCESS; } @@ -1265,7 +1259,6 @@ void nexthop_group_interface_state_change(struct interface *ifp, if (ifp->ifindex != nhop.ifindex) continue; - ifp->configured = true; nh = nexthop_new(); memcpy(nh, &nhop, sizeof(nhop)); |