summaryrefslogtreecommitdiff
path: root/zebra/interface.h
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/interface.h')
-rw-r--r--zebra/interface.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/zebra/interface.h b/zebra/interface.h
index 8d19c1838f..2c7a079bf4 100644
--- a/zebra/interface.h
+++ b/zebra/interface.h
@@ -94,9 +94,6 @@ enum zebra_if_flags {
#define ZEBRA_IF_IS_PROTODOWN_ONLY_EXTERNAL(zif) \
((zif)->protodown_rc == ZEBRA_PROTODOWN_EXTERNAL)
-/* Mem type for zif desc */
-DECLARE_MTYPE(ZIF_DESC);
-
/* `zebra' daemon local interface structure. */
struct zebra_if {
/* back pointer to the interface */
@@ -215,6 +212,9 @@ struct zebra_if {
char neigh_mac[6];
struct in6_addr v6_2_v4_ll_addr6;
+ /* Linkage for per-vrf/per-NS ifp container */
+ struct ifp_tree_link *ns_tree_link;
+
/* The description of the interface */
char *desc;
};
@@ -262,12 +262,10 @@ extern void zebra_if_init(void);
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_link_per_ns(struct zebra_ns *, struct interface *);
extern struct interface *if_lookup_by_index_per_nsid(ns_id_t nsid,
uint32_t ifindex);
extern const char *ifindex2ifname_per_ns(struct zebra_ns *, unsigned int);
-extern void if_unlink_per_ns(struct interface *);
extern void if_nbr_mac_to_ipv4ll_neigh_update(struct interface *fip,
char mac[6],
struct in6_addr *address,