summaryrefslogtreecommitdiff
path: root/zebra/if_ioctl.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-01-13 07:57:57 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-01-13 08:05:50 -0500
commit56c1f7d852de98aa5d752f9c7777ece660c26fdb (patch)
tree7cac20e7ea1d0ec6dd46a5398cd9b43643071b52 /zebra/if_ioctl.c
parentb98f56422e692217bb149aaa78fda77e07097658 (diff)
frr: Remove HAVE_IPV6 from code base
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/if_ioctl.c')
-rw-r--r--zebra/if_ioctl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c
index cc348fc237..36b0a6c795 100644
--- a/zebra/if_ioctl.c
+++ b/zebra/if_ioctl.c
@@ -244,7 +244,6 @@ if_getaddrs (void)
connected_add_ipv4 (ifp, flags, &addr->sin_addr,
prefixlen, dest_pnt, NULL);
}
-#ifdef HAVE_IPV6
if (ifap->ifa_addr->sa_family == AF_INET6)
{
struct sockaddr_in6 *addr;
@@ -289,7 +288,6 @@ if_getaddrs (void)
connected_add_ipv6 (ifp, flags, &addr->sin6_addr, prefixlen,
dest_pnt, NULL);
}
-#endif /* HAVE_IPV6 */
}
freeifaddrs (ifapfree);
@@ -336,9 +334,9 @@ interface_list (struct zebra_ns *zns)
if_getaddrs ();
-#if defined(HAVE_IPV6) && defined(HAVE_PROC_NET_IF_INET6)
+#if defined(HAVE_PROC_NET_IF_INET6)
/* Linux provides interface's IPv6 address via
/proc/net/if_inet6. */
ifaddr_proc_ipv6 ();
-#endif /* HAVE_IPV6 && HAVE_PROC_NET_IF_INET6 */
+#endif /* HAVE_PROC_NET_IF_INET6 */
}