summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/carp.c
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2006-06-17 15:54:33 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2006-06-17 15:54:33 +0000
commitd182f8bedd433d1d257136760201058f477d599e (patch)
tree12f1adc15e0e37027b1c2a30466a2d4b80efcc1c /usr.sbin/bgpd/carp.c
parenta9f5b31f00801e222ee92ce7429a59bab1ea1ab2 (diff)
use the carp_demote_ioctl directly instead of carp_demote_set, ok claudio
Diffstat (limited to 'usr.sbin/bgpd/carp.c')
-rw-r--r--usr.sbin/bgpd/carp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/bgpd/carp.c b/usr.sbin/bgpd/carp.c
index e966670bcc5..70ec4de5d6e 100644
--- a/usr.sbin/bgpd/carp.c
+++ b/usr.sbin/bgpd/carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: carp.c,v 1.1 2006/06/17 15:04:18 henning Exp $ */
+/* $OpenBSD: carp.c,v 1.2 2006/06/17 15:54:32 henning Exp $ */
/*
* Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -91,7 +91,8 @@ carp_demote_shutdown(void)
while ((c = TAILQ_FIRST(&carpgroups)) != NULL) {
TAILQ_REMOVE(&carpgroups, c, entry);
for (; c->changed_by > 0; c->changed_by--)
- carp_demote_set(c->group, -1);
+ if (c->do_demote)
+ carp_demote_ioctl(c->group, -1);
free(c->group);
free(c);