]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #1927 from pguibert6WIND/issue_1926
authorRenato Westphal <renato@openbsd.org>
Wed, 4 Apr 2018 00:41:12 +0000 (21:41 -0300)
committerGitHub <noreply@github.com>
Wed, 4 Apr 2018 00:41:12 +0000 (21:41 -0300)
zebra: delete interface that disappeared

1  2 
zebra/if_netlink.c
zebra/interface.c
zebra/interface.h

Simple merge
Simple merge
index 7a776f5e3038c30ba483a94983014ac0b0e3dc47,f01864c9fb16ca05a8a30d4f0e3e8acc234ba0f3..fba3201c5c56b967f128b3935320414722bda9b1
@@@ -314,9 -314,12 +314,11 @@@ static inline void zebra_if_set_ziftype
  
  extern void zebra_if_init(void);
  
 -extern struct interface *if_lookup_by_index_per_ns(struct zebra_ns *,
 -                                                 u_int32_t);
 +extern struct interface *if_lookup_by_index_per_ns(struct zebra_ns *, uint32_t);
  extern struct interface *if_lookup_by_name_per_ns(struct zebra_ns *,
                                                  const char *);
+ extern struct interface *if_lookup_by_name_not_ns(ns_id_t ns_id,
+                                                 const char *ifname);
  extern struct interface *if_link_per_ns(struct zebra_ns *, struct interface *);
  extern const char *ifindex2ifname_per_ns(struct zebra_ns *, unsigned int);