diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2006-08-28 17:29:54 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2006-08-28 17:29:54 +0000 |
| commit | 2ab81832b20fd389cafab35fe8cec780751dfd33 (patch) | |
| tree | f6d00524d9250c0bb48980ee7a3aabf4a7f1ff70 /sys/netinet6 | |
| parent | 36c14969ad2c478d40023a6324c1dc6befce513a (diff) | |
Make carp see all IPv6 address additions and remove dead code in carp_ioctl()
ok mpf@ henning@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 71e92c475e7..3898bf493ae 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.67 2006/06/16 16:49:40 henning Exp $ */ +/* $OpenBSD: in6.c,v 1.68 2006/08/28 17:29:53 mcbride Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -1596,7 +1596,7 @@ in6_ifinit(ifp, ia, sin6, newhost) /* * Give the interface a chance to initialize - * if this is its first address, + * if this is its first address (or it is a CARP interface) * and to validate the address if necessary. */ TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { @@ -1609,7 +1609,7 @@ in6_ifinit(ifp, ia, sin6, newhost) ia->ia_addr = *sin6; - if (ifacount <= 1 && ifp->if_ioctl && + if ((ifacount <= 1 || ifp->if_type == IFT_CARP) && ifp->if_ioctl && (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia))) { splx(s); return (error); |