diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-06-30 07:02:23 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-06-30 07:02:23 +0000 |
commit | d42f60da686db34f0a9ce50f75b518047e82e3c2 (patch) | |
tree | 8958eae4a05f3e2a681a63eacd1e0b0dcf20cf1c | |
parent | e456104c4137db5d6b133d5d6baed29360fc1040 (diff) |
Kill dead code, what does a negative number of addresses on a carp(4)
mean?
ok deraadt@
-rw-r--r-- | sys/netinet/ip_carp.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 10b2c6febfa..0c50adc9d53 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.229 2014/04/30 10:04:33 mpi Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.230 2014/06/30 07:02:22 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1697,24 +1697,6 @@ carp_set_ifp(struct carp_softc *sc, struct ifnet *ifp) if (sc->sc_carpdev != NULL) carpdetach(sc); - /* join multicast groups */ - if (sc->sc_naddrs < 0 && - (error = carp_join_multicast(sc)) != 0) { - if (ncif != NULL) - free(ncif, M_IFADDR); - return (error); - } - -#ifdef INET6 - if (sc->sc_naddrs6 < 0 && - (error = carp_join_multicast6(sc)) != 0) { - if (ncif != NULL) - free(ncif, M_IFADDR); - carp_multicast_cleanup(sc); - return (error); - } -#endif - /* attach carp interface to physical interface */ if (ncif != NULL) ifp->if_carp = (caddr_t)ncif; |