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/if_ioctl_solaris.c | |
| parent | 5731f9c9e57f5abfeff891fd036e9527bb14e023 (diff) | |
| parent | 602ba9bd8b118d3c1302e890010ca7c5d94e0ff5 (diff) | |
Merge pull request #68 from donaldsharp/cleanup
Cleanup
Diffstat (limited to 'zebra/if_ioctl_solaris.c')
| -rw-r--r-- | zebra/if_ioctl_solaris.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/zebra/if_ioctl_solaris.c b/zebra/if_ioctl_solaris.c index 0e727b9dc4..f27dc89007 100644 --- a/zebra/if_ioctl_solaris.c +++ b/zebra/if_ioctl_solaris.c @@ -177,12 +177,7 @@ calculate_lifc_len: /* must hold privileges to enter here */ if (lifreq->lifr_addr.ss_family == AF_INET6) { -#ifdef HAVE_IPV6 ifp->flags |= IFF_IPV6; -#else - lifreq++; - continue; -#endif /* HAVE_IPV6 */ } if_add_update (ifp); @@ -309,7 +304,6 @@ if_get_addr (struct interface *ifp, struct sockaddr *addr, const char *label) dest_pnt = (char *) &SIN (&dest)->sin_addr; } } -#ifdef HAVE_IPV6 else if (af == AF_INET6) { if (if_ioctl_ipv6 (SIOCGLIFSUBNET, (caddr_t) & lifreq) < 0) @@ -325,17 +319,14 @@ if_get_addr (struct interface *ifp, struct sockaddr *addr, const char *label) prefixlen = lifreq.lifr_addrlen; } } -#endif /* HAVE_IPV6 */ /* Set address to the interface. */ if (af == AF_INET) connected_add_ipv4 (ifp, flags, &SIN (addr)->sin_addr, prefixlen, (struct in_addr *) dest_pnt, label); -#ifdef HAVE_IPV6 else if (af == AF_INET6) connected_add_ipv6 (ifp, flags, &SIN6 (addr)->sin6_addr, prefixlen, (struct in6_addr *) dest_pnt, label); -#endif /* HAVE_IPV6 */ return 0; } @@ -367,7 +358,6 @@ interface_list (struct zebra_ns *zns) struct connected * if_lookup_linklocal (struct interface *ifp) { -#ifdef HAVE_IPV6 struct listnode *node; struct connected *ifc; @@ -380,7 +370,6 @@ if_lookup_linklocal (struct interface *ifp) (IN6_IS_ADDR_LINKLOCAL (&ifc->address->u.prefix6))) return ifc; } -#endif /* HAVE_IPV6 */ return NULL; } |