[src/netbsd-6]: src/sys/netinet Pull up following revision(s) (requested by b...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/29afea088ee8
branches:  netbsd-6
changeset: 773964:29afea088ee8
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 02 18:25:35 2012 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #145):
        sys/netinet/ip_carp.c: revision 1.48
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 8a757fa8ad02 -r 29afea088ee8 sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Mon Apr 02 18:22:03 2012 +0000
+++ b/sys/netinet/ip_carp.c     Mon Apr 02 18:25:35 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.47.4.1 2012/04/02 18:25:35 riz 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.47.4.1 2012/04/02 18:25:35 riz 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);
 }