diff options
| author | Olivier Dugeon <olivier.dugeon@orange.com> | 2017-01-16 15:12:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 15:12:55 +0100 |
| commit | ab0c9543a9f3337b1d99727a438d1293ef8b2956 (patch) | |
| tree | 529e6476fdcd48500bcca77ef77b3d68da23f1c6 /zebra/interface.c | |
| parent | 5731f9c9e57f5abfeff891fd036e9527bb14e023 (diff) | |
| parent | 602ba9bd8b118d3c1302e890010ca7c5d94e0ff5 (diff) | |
Merge pull request #68 from donaldsharp/cleanup
Cleanup
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index 4a0409702f..5a9de5b70b 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -439,7 +439,6 @@ if_addr_wakeup (struct interface *ifp) * from the kernel has been received. * It will also be added to the interface's subnet list then. */ } -#ifdef HAVE_IPV6 if (p->family == AF_INET6) { if (! if_is_up (ifp)) @@ -461,7 +460,6 @@ if_addr_wakeup (struct interface *ifp) /* The address will be advertised to zebra clients when the notification * from the kernel has been received. */ } -#endif /* HAVE_IPV6 */ } } } @@ -1060,10 +1058,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp) vty_out (vty, " index %d metric %d mtu %d ", ifp->ifindex, ifp->metric, ifp->mtu); -#ifdef HAVE_IPV6 if (ifp->mtu6 != ifp->mtu) vty_out (vty, "mtu6 %d ", ifp->mtu6); -#endif vty_out (vty, "%s flags: %s%s", VTY_NEWLINE, if_flag_dump (ifp->flags), VTY_NEWLINE); @@ -2547,7 +2543,6 @@ DEFUN (no_ip_address_label, } #endif /* HAVE_NETLINK */ -#ifdef HAVE_IPV6 static int ipv6_address_install (struct vty *vty, struct interface *ifp, const char *addr_str, const char *peer_str, @@ -2723,7 +2718,6 @@ DEFUN (no_ipv6_address, VTY_DECLVAR_CONTEXT (interface, ifp); return ipv6_address_uninstall (vty, ifp, argv[idx_ipv6_prefixlen]->arg, NULL, NULL, 0); } -#endif /* HAVE_IPV6 */ static int link_params_config_write (struct vty *vty, struct interface *ifp) @@ -2896,10 +2890,8 @@ zebra_if_init (void) install_element (INTERFACE_NODE, &no_bandwidth_if_cmd); install_element (INTERFACE_NODE, &ip_address_cmd); install_element (INTERFACE_NODE, &no_ip_address_cmd); -#ifdef HAVE_IPV6 install_element (INTERFACE_NODE, &ipv6_address_cmd); install_element (INTERFACE_NODE, &no_ipv6_address_cmd); -#endif /* HAVE_IPV6 */ #ifdef HAVE_NETLINK install_element (INTERFACE_NODE, &ip_address_label_cmd); install_element (INTERFACE_NODE, &no_ip_address_label_cmd); |