From 6fc43f81fc51d876a84da1486c86722c42d95868 Mon Sep 17 00:00:00 2001 From: friehm Date: Tue, 10 Jul 2018 11:22:54 +0000 Subject: [PATCH] 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@ --- sys/netinet/ip_carp.c | 4 +--- 1 file changed, 1 insertion(+), 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 */ -- 2.20.1