diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-13 07:57:57 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-13 08:05:50 -0500 |
| commit | 56c1f7d852de98aa5d752f9c7777ece660c26fdb (patch) | |
| tree | 7cac20e7ea1d0ec6dd46a5398cd9b43643071b52 /zebra/if_netlink.c | |
| parent | b98f56422e692217bb149aaa78fda77e07097658 (diff) | |
frr: Remove HAVE_IPV6 from code base
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/if_netlink.c')
| -rw-r--r-- | zebra/if_netlink.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index c5fd16b9cd..678c217321 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -373,7 +373,6 @@ interface_lookup_netlink (struct zebra_ns *zns) if (ret < 0) return ret; -#ifdef HAVE_IPV6 /* Get IPv6 address of the interfaces. */ ret = netlink_request (AF_INET6, RTM_GETADDR, &zns->netlink_cmd); if (ret < 0) @@ -381,7 +380,6 @@ interface_lookup_netlink (struct zebra_ns *zns) ret = netlink_parse_info (netlink_interface_addr, &zns->netlink_cmd, zns, 0); if (ret < 0) return ret; -#endif /* HAVE_IPV6 */ return 0; } @@ -468,10 +466,7 @@ netlink_interface_addr (struct sockaddr_nl *snl, struct nlmsghdr *h, ifa = NLMSG_DATA (h); if (ifa->ifa_family != AF_INET -#ifdef HAVE_IPV6 - && ifa->ifa_family != AF_INET6 -#endif /* HAVE_IPV6 */ - ) + && ifa->ifa_family != AF_INET6) return 0; if (h->nlmsg_type != RTM_NEWADDR && h->nlmsg_type != RTM_DELADDR) @@ -571,7 +566,6 @@ netlink_interface_addr (struct sockaddr_nl *snl, struct nlmsghdr *h, (struct in_addr *) addr, ifa->ifa_prefixlen, (struct in_addr *) broad); } -#ifdef HAVE_IPV6 if (ifa->ifa_family == AF_INET6) { if (h->nlmsg_type == RTM_NEWADDR) @@ -589,7 +583,6 @@ netlink_interface_addr (struct sockaddr_nl *snl, struct nlmsghdr *h, (struct in6_addr *) addr, ifa->ifa_prefixlen, (struct in6_addr *) broad); } -#endif /* HAVE_IPV6 */ return 0; } |