summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-12-17 06:47:01 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-12-17 06:47:01 +0000
commit92c57630e3134659657a1da7cf05129313db750f (patch)
tree7fdf68b5a64aeeeaa3cf8219f469f55be5b37e3a /sys
parent9b922181b6b3d31ed022006a9e1e6be26d62ab25 (diff)
Remember to decrement carp_suppress_preempt when detaching.
ok pascoe@
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/ip_carp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 2ddb286b007..9afae3af7cf 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.81 2004/12/15 18:40:09 mcbride Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.82 2004/12/17 06:47:00 mcbride Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -752,6 +752,10 @@ carpdetach(struct carp_softc *sc)
timeout_del(&sc->sc_md_tmo);
timeout_del(&sc->sc_md6_tmo);
+ if (sc->sc_suppress)
+ carp_suppress_preempt--;
+ sc->sc_suppress = 0;
+
carp_set_state(sc, INIT);
sc->sc_ac.ac_if.if_flags &= ~IFF_UP;
carp_setrun(sc, 0);