diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-08-31 04:49:22 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-08-31 04:49:22 +0000 |
| commit | c200ddae73ad3f2c57a6a39d1dd267034b80a971 (patch) | |
| tree | a6f058f7a73733242a5a6180d499dbda53652d47 /sys | |
| parent | ff4e92269a003740141479b0ae28e529453b72ec (diff) | |
Comment out KASSERT(mc != NULL) in carp_ether_delmulti. Because we mess with
the multicast list elsewhere, it can occur under certain conditions (PR4475).
ok deraadt@ mpf@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_carp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index f75af9d8447..ab48b90e0bd 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.108 2005/07/31 03:52:19 pascoe Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.109 2005/08/31 04:49:21 mcbride Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -2108,7 +2108,11 @@ carp_ether_delmulti(struct carp_softc *sc, struct ifreq *ifr) break; } } - KASSERT(mc != NULL); + /* + * XXX We don't actually want KASSERT(mc != NULL) here + * because we mess with the multicast addresses elsewhere. + * Clean up after release. + */ } else (void)ether_addmulti(ifr, (struct arpcom *)&sc->sc_ac); return (error); |