diff options
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index afb08f7012..5b866baaac 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1150,6 +1150,15 @@ static const char *zebra_ziftype_2str(zebra_iftype_t zif_type) return "VETH"; break; + case ZEBRA_IF_BOND: + return "bond"; + + case ZEBRA_IF_BOND_SLAVE: + return "bond_slave"; + + case ZEBRA_IF_MACVLAN: + return "macvlan"; + default: return "Unknown"; break; @@ -1279,6 +1288,15 @@ static void if_dump_vty(struct vty *vty, struct interface *ifp) br_slave->bridge_ifindex); } + if (IS_ZEBRA_IF_BOND_SLAVE(ifp)) { + struct zebra_l2info_bondslave *bond_slave; + + bond_slave = &zebra_if->bondslave_info; + if (bond_slave->bond_ifindex != IFINDEX_INTERNAL) + vty_out(vty, " Master (bond) ifindex %u\n", + bond_slave->bond_ifindex); + } + if (zebra_if->link_ifindex != IFINDEX_INTERNAL) { vty_out(vty, " Link ifindex %u", zebra_if->link_ifindex); if (zebra_if->link) @@ -2749,7 +2767,7 @@ DEFUN (no_ip_address_label, static int ipv6_address_install(struct vty *vty, struct interface *ifp, const char *addr_str, const char *peer_str, - const char *label, int secondary) + const char *label) { struct zebra_if *if_data; struct prefix_ipv6 cp; @@ -2780,10 +2798,6 @@ static int ipv6_address_install(struct vty *vty, struct interface *ifp, *p = cp; ifc->address = (struct prefix *)p; - /* Secondary. */ - if (secondary) - SET_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY); - /* Label. */ if (label) ifc->label = XSTRDUP(MTYPE_CONNECTED_LABEL, label); @@ -2839,7 +2853,7 @@ int ipv6_address_configured(struct interface *ifp) static int ipv6_address_uninstall(struct vty *vty, struct interface *ifp, const char *addr_str, const char *peer_str, - const char *label, int secondry) + const char *label) { struct prefix_ipv6 cp; struct connected *ifc; @@ -2897,7 +2911,7 @@ DEFUN (ipv6_address, int idx_ipv6_prefixlen = 2; VTY_DECLVAR_CONTEXT(interface, ifp); return ipv6_address_install(vty, ifp, argv[idx_ipv6_prefixlen]->arg, - NULL, NULL, 0); + NULL, NULL); } DEFUN (no_ipv6_address, @@ -2911,7 +2925,7 @@ DEFUN (no_ipv6_address, int idx_ipv6_prefixlen = 3; VTY_DECLVAR_CONTEXT(interface, ifp); return ipv6_address_uninstall(vty, ifp, argv[idx_ipv6_prefixlen]->arg, - NULL, NULL, 0); + NULL, NULL); } static int link_params_config_write(struct vty *vty, struct interface *ifp) |