diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-10-28 23:07:13 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-10-28 23:07:13 +0000 |
| commit | b4a28de4c53a42e330a0b951d87a5086b485e39b (patch) | |
| tree | 74d3dc2a7b861a08c881762ef28fb315ad9874aa /sys/netinet/ip_carp.c | |
| parent | 899191a63e81db19e3f586bc852fbf7eef937bb5 (diff) | |
Do not keep retrying to send advertisements if there is
no carpdev configured.
I don't see how we can run into this at all, but let's
leave this test for a a little extra safety.
OK henning@
Diffstat (limited to 'sys/netinet/ip_carp.c')
| -rw-r--r-- | sys/netinet/ip_carp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index bb61dd7d10f..228163fcf6c 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.168 2008/09/03 08:37:51 mpf Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.169 2008/10/28 23:07:12 mpf Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1088,13 +1088,13 @@ carp_send_ad(void *v) struct ifaddr *ifa; struct sockaddr sa; - s = splsoftnet(); - if (sc->sc_carpdev == NULL) { sc->sc_if.if_oerrors++; - goto retry_later; + return; } + s = splsoftnet(); + /* bow out if we've gone to backup (the carp interface is going down) */ if (sc->sc_bow_out) { advbase = 255; |