]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #9837 from idryzhov/cleanup-if-by-name-vrf-all
authorRuss White <russ@riw.us>
Wed, 27 Oct 2021 19:29:39 +0000 (15:29 -0400)
committerGitHub <noreply@github.com>
Wed, 27 Oct 2021 19:29:39 +0000 (15:29 -0400)
*: fix usage of if_lookup_by_name_all_vrf

1  2 
bgpd/bgp_routemap.c
bgpd/bgp_zebra.c
lib/if.c
lib/if.h
ospf6d/ospf6_asbr.c
pbrd/pbr_vty.c
zebra/interface.c

Simple merge
Simple merge
diff --cc lib/if.c
Simple merge
diff --cc lib/if.h
index d20113d500111adcd3b5e0bd46576eb95eff90cb,60d571b54e2d193e97fb565385ce0f236be2b448..1d32c2b08812da53a38f26bfc32d9b9affefb6c3
+++ b/lib/if.h
@@@ -526,11 -529,10 +526,10 @@@ size_t if_lookup_by_hwaddr(const uint8_
                           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);
 -extern struct interface *if_get_by_ifindex(ifindex_t ifindex, vrf_id_t vrf_id);
 +extern struct interface *if_get_by_name(const char *ifname, vrf_id_t vrf_id,
 +                                      const char *vrf_name);
  
  /* Sets the index and adds to index list */
  extern int if_set_index(struct interface *ifp, ifindex_t ifindex);
Simple merge
diff --cc pbrd/pbr_vty.c
Simple merge
Simple merge