]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #9833 from idryzhov/cleanup-if-by-index-all-vrf
authorRuss White <russ@riw.us>
Fri, 5 Nov 2021 19:17:31 +0000 (15:17 -0400)
committerGitHub <noreply@github.com>
Fri, 5 Nov 2021 19:17:31 +0000 (15:17 -0400)
*: fix usage of if_lookup_by_index_all_vrf

1  2 
bfdd/bfd.c
lib/if.c
lib/if.h
ospf6d/ospf6_route.c
zebra/zebra_l2.c

diff --cc bfdd/bfd.c
Simple merge
diff --cc lib/if.c
index 4ccb36d09164dda42653d12ced2d93e14f4cf733,7eaede78fdc2f1224635d8e184f34276f1137638..71d2f5d9ccdafffac02d279b7bb3f1691916f52a
+++ b/lib/if.c
@@@ -45,9 -45,9 +45,10 @@@ DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED
  DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label");
  DEFINE_MTYPE_STATIC(LIB, IF_LINK_PARAMS, "Informational Link Parameters");
  
 +static void if_set_name(struct interface *ifp, const char *name);
  static struct interface *if_lookup_by_ifindex(ifindex_t ifindex,
                                              vrf_id_t vrf_id);
+ static struct interface *if_lookup_by_index_all_vrf(ifindex_t ifindex);
  static int if_cmp_func(const struct interface *, const struct interface *);
  static int if_cmp_index_func(const struct interface *ifp1,
                             const struct interface *ifp2);
diff --cc lib/if.h
Simple merge
Simple merge
Simple merge