diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-02 15:52:09 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-02 15:52:09 -0400 |
| commit | 05ba625af7cbeb08322a1ea761732521816245bd (patch) | |
| tree | b5501ff31d67ec53a0da4935f59a17478b637255 /ldpd/ldpd.h | |
| parent | df581cd3e137e8d3ab0f9acbb3d33bdb1e63face (diff) | |
| parent | 826fe613f95fcf6047c987757c946bb53cb99929 (diff) | |
Merge remote-tracking branch 'origin/stable/3.0'
Diffstat (limited to 'ldpd/ldpd.h')
| -rw-r--r-- | ldpd/ldpd.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index cba1939d98..3acc4fbe2d 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -305,7 +305,7 @@ struct iface { struct if_addr_head addr_list; struct in6_addr linklocal; enum iface_type type; - uint16_t flags; + int operative; struct iface_af ipv4; struct iface_af ipv6; QOBJ_FIELDS @@ -387,7 +387,7 @@ struct l2vpn_if { struct l2vpn *l2vpn; char ifname[IF_NAMESIZE]; unsigned int ifindex; - uint16_t flags; + int operative; uint8_t mac[ETHER_ADDR_LEN]; QOBJ_FIELDS }; @@ -553,6 +553,7 @@ struct kpw { }; struct kaddr { + char ifname[IF_NAMESIZE]; unsigned short ifindex; int af; union ldpd_addr addr; @@ -564,6 +565,7 @@ struct kif { char ifname[IF_NAMESIZE]; unsigned short ifindex; int flags; + int operative; uint8_t mac[ETHER_ADDR_LEN]; int mtu; }; @@ -581,7 +583,6 @@ struct ctl_iface { char name[IF_NAMESIZE]; unsigned int ifindex; int state; - uint16_t flags; enum iface_type type; uint16_t hello_holdtime; uint16_t hello_interval; |