Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Do not sleep in callout context, this will hang ...
details: https://anonhg.NetBSD.org/src/rev/f006d420e556
branches: trunk
changeset: 778458:f006d420e556
user: bouyer <bouyer%NetBSD.org@localhost>
date: Tue Mar 27 17:48:17 2012 +0000
description:
Do not sleep in callout context, this will hang the clock soft interrupt.
Should fix PR kern/46217.
diffstat:
sys/netinet/ip_carp.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diffs (38 lines):
diff -r 10ff5a7c27c9 -r f006d420e556 sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c Tue Mar 27 15:07:01 2012 +0000
+++ b/sys/netinet/ip_carp.c Tue Mar 27 17:48:17 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.47 2011/11/19 22:51:25 tls Exp $ */
+/* $NetBSD: ip_carp.c,v 1.48 2012/03/27 17:48:17 bouyer Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -30,7 +30,7 @@
#include "opt_inet.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.47 2011/11/19 22:51:25 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.48 2012/03/27 17:48:17 bouyer Exp $");
/*
* TODO:
@@ -1146,9 +1146,6 @@
in = &ifatoia(ifa)->ia_addr.sin_addr;
arprequest(sc->sc_carpdev, in, in, CLLADDR(sc->sc_if.if_sadl));
-
- /* XXX: why does this need to delay? */
- kpause("carpdel", false, MAX(1, mstohz(1)), NULL);
}
splx(s);
}
@@ -1170,9 +1167,6 @@
in6 = &ifatoia6(ifa)->ia_addr.sin6_addr;
nd6_na_output(sc->sc_carpdev, &mcast, in6,
ND_NA_FLAG_OVERRIDE, 1, NULL);
-
- /* XXX: why does this need to delay? */
- kpause("carpdel6", false, MAX(1, mstohz(1)), NULL);
}
splx(s);
}
Home |
Main Index |
Thread Index |
Old Index