diff options
| author | Peter Valchev <pvalchev@cvs.openbsd.org> | 2004-05-30 23:03:35 +0000 |
|---|---|---|
| committer | Peter Valchev <pvalchev@cvs.openbsd.org> | 2004-05-30 23:03:35 +0000 |
| commit | dc3f44f7515c3be73ec4b9ab60b0082704668fbc (patch) | |
| tree | d5d2c2528dcc2cff5023bb25dec1dd1fbba214bc /sys/netinet | |
| parent | aabafe7bf86cf64e3e6140bdd2199b1429cf86fa (diff) | |
compile without INET6; ok mcbride
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_carp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 0dd658e6920..bf7cc8807bb 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.56 2004/05/29 08:44:21 mcbride Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.57 2004/05/30 23:03:34 pvalchev Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -655,7 +655,9 @@ carp_clone_destroy(struct ifnet *ifp) struct carp_softc *sc = ifp->if_softc; struct carp_if *cif; struct ip_moptions *imo = &sc->sc_imo; +#ifdef INET6 struct ip6_moptions *im6o = &sc->sc_im6o; +#endif timeout_del(&sc->sc_ad_tmo); timeout_del(&sc->sc_md_tmo); @@ -672,6 +674,7 @@ carp_clone_destroy(struct ifnet *ifp) imo->imo_multicast_ifp = NULL; /* Clear IPv6 multicast */ +#ifdef INET6 while (!LIST_EMPTY(&im6o->im6o_memberships)) { struct in6_multi_mship *imm = LIST_FIRST(&im6o->im6o_memberships); @@ -679,6 +682,7 @@ carp_clone_destroy(struct ifnet *ifp) LIST_REMOVE(imm, i6mm_chain); in6_leavegroup(imm); } +#endif sc->sc_ifp->if_carp = NULL; FREE(cif, M_IFADDR); |