summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorfriehm <friehm@cvs.openbsd.org>2018-07-10 11:22:55 +0000
committerfriehm <friehm@cvs.openbsd.org>2018-07-10 11:22:55 +0000
commit60c5ba69db926c79a84e575081800d3d725292b9 (patch)
tree7753e1202813bfb11c32d182ecdd92fbe948375b /sys
parent33c34f5d99f4a32856d4187c0d125bf85d1d839f (diff)
Remove DELAY(1000) from carp_send_arp() / carp_send_na() since it is not clear
why it was necessary. OK bluhm@ 'ok but watch for fallouts' mpi@
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/ip_carp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 06b2bccd716..39ee14628e4 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.332 2018/05/21 15:52:22 bluhm Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.333 2018/07/10 11:22:54 friehm Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -1277,7 +1277,6 @@ carp_send_arp(struct carp_softc *sc)
in = ifatoia(ifa)->ia_addr.sin_addr.s_addr;
arprequest(&sc->sc_if, &in, &in, sc->sc_ac.ac_enaddr);
- DELAY(1000); /* XXX */
}
}
@@ -1298,7 +1297,6 @@ carp_send_na(struct carp_softc *sc)
nd6_na_output(&sc->sc_if, &mcast, in6,
ND_NA_FLAG_OVERRIDE |
(ip6_forwarding ? ND_NA_FLAG_ROUTER : 0), 1, NULL);
- DELAY(1000); /* XXX */
}
}
#endif /* INET6 */