diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /zebra/if_ioctl.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'zebra/if_ioctl.c')
| -rw-r--r-- | zebra/if_ioctl.c | 6 |
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 */ } |