diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-04-17 16:50:23 +0100 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-04-17 16:50:23 +0100 |
| commit | 31d9b6c31d949bf0e884d8a6e02939345b9816e1 (patch) | |
| tree | 7a6588c12a16f99b512232b77e86118837c646c4 /zebra/ioctl_solaris.c | |
| parent | 825f338d44433fc2d351c08d41272f52a15329db (diff) | |
| download | quagga-31d9b6c31d949bf0e884d8a6e02939345b9816e1.tar.bz2 quagga-31d9b6c31d949bf0e884d8a6e02939345b9816e1.tar.xz | |
Bring up to date with 0.99.16 release
This brings this branch up to date with 0.99.16, EXCEPT for the
change to bgpd to use monotonic clock for timing updates.
There are places where bgpd expects to find the actual time that
things happened... so this change is not though to be complete.
Further tidying in zebra, for FreeBSD.
Diffstat (limited to 'zebra/ioctl_solaris.c')
| -rw-r--r-- | zebra/ioctl_solaris.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c index 6c1c254a..5c7c00b1 100644 --- a/zebra/ioctl_solaris.c +++ b/zebra/ioctl_solaris.c @@ -79,11 +79,11 @@ if_ioctl (u_long request, caddr_t buffer) return 0; } +#ifdef HAVE_IPV6 int if_ioctl_ipv6 (u_long request, caddr_t buffer) { -#ifdef HAVE_IPV6 int sock; int ret; int err; @@ -115,11 +115,12 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer) errno = err; return ret; } -#endif /* HAVE_IPV6 */ return 0; } +#endif /* HAVE_IPV6 */ + /* * get interface metric * -- if value is not avaliable set -1 |