diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-13 13:57:57 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-13 14:05:50 +0100 |
| commit | 56c1f7d852de98aa5d752f9c7777ece660c26fdb (patch) | |
| tree | 7cac20e7ea1d0ec6dd46a5398cd9b43643071b52 /isisd/isis_zebra.c | |
| parent | Merge pull request #55 from donaldsharp/monotonic (diff) | |
| download | frr-56c1f7d852de98aa5d752f9c7777ece660c26fdb.tar.xz frr-56c1f7d852de98aa5d752f9c7777ece660c26fdb.zip | |
frr: Remove HAVE_IPV6 from code base
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'isisd/isis_zebra.c')
| -rw-r--r-- | isisd/isis_zebra.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 646c5fa88..dfb9b4d7a 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -187,10 +187,8 @@ isis_zebra_if_address_add (int command, struct zclient *zclient, #ifdef EXTREME_DEBUG if (p->family == AF_INET) zlog_debug ("connected IP address %s", buf); -#ifdef HAVE_IPV6 if (p->family == AF_INET6) zlog_debug ("connected IPv6 address %s", buf); -#endif /* HAVE_IPV6 */ #endif /* EXTREME_DEBUG */ if (if_is_operative (c->ifp)) isis_circuit_add_addr (circuit_scan_by_ifp (c->ifp), c); @@ -223,10 +221,8 @@ isis_zebra_if_address_del (int command, struct zclient *client, if (p->family == AF_INET) zlog_debug ("disconnected IP address %s", buf); -#ifdef HAVE_IPV6 if (p->family == AF_INET6) zlog_debug ("disconnected IPv6 address %s", buf); -#endif /* HAVE_IPV6 */ #endif /* EXTREME_DEBUG */ if (if_is_operative (ifp)) @@ -352,7 +348,6 @@ isis_zebra_route_del_ipv4 (struct prefix *prefix, return; } -#ifdef HAVE_IPV6 static void isis_zebra_route_add_ipv6 (struct prefix *prefix, struct isis_route_info *route_info) @@ -518,8 +513,6 @@ isis_zebra_route_del_ipv6 (struct prefix *prefix, XFREE (MTYPE_ISIS_TMP, ifindex_list); } -#endif /* HAVE_IPV6 */ - void isis_zebra_route_update (struct prefix *prefix, struct isis_route_info *route_info) @@ -535,19 +528,15 @@ isis_zebra_route_update (struct prefix *prefix, { if (prefix->family == AF_INET) isis_zebra_route_add_ipv4 (prefix, route_info); -#ifdef HAVE_IPV6 else if (prefix->family == AF_INET6) isis_zebra_route_add_ipv6 (prefix, route_info); -#endif /* HAVE_IPV6 */ } else { if (prefix->family == AF_INET) isis_zebra_route_del_ipv4 (prefix, route_info); -#ifdef HAVE_IPV6 else if (prefix->family == AF_INET6) isis_zebra_route_del_ipv6 (prefix, route_info); -#endif /* HAVE_IPV6 */ } return; } @@ -709,10 +698,8 @@ isis_zebra_init (struct thread_master *master) zclient->interface_link_params = isis_zebra_link_params; zclient->redistribute_route_ipv4_add = isis_zebra_read_ipv4; zclient->redistribute_route_ipv4_del = isis_zebra_read_ipv4; -#ifdef HAVE_IPV6 zclient->redistribute_route_ipv6_add = isis_zebra_read_ipv6; zclient->redistribute_route_ipv6_del = isis_zebra_read_ipv6; -#endif /* HAVE_IPV6 */ return; } |