From owner-p4-projects@FreeBSD.ORG  Mon Feb  6 21:41:40 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08C2616A424; Mon,  6 Feb 2006 21:41:39 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D798616A420
	for <perforce@freebsd.org>; Mon,  6 Feb 2006 21:41:38 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 69CBF43D62
	for <perforce@freebsd.org>; Mon,  6 Feb 2006 21:41:29 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16LfTDm097448
	for <perforce@freebsd.org>; Mon, 6 Feb 2006 21:41:29 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16LfTZ3097445
	for perforce@freebsd.org; Mon, 6 Feb 2006 21:41:29 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 6 Feb 2006 21:41:29 GMT
Message-Id: <200602062141.k16LfTZ3097445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91262 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Feb 2006 21:41:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=91262

Change 91262 by jhb@jhb_slimer on 2006/02/06 21:41:24

	Save this potential bugfix until someone tests it.

Affected files ...

.. //depot/projects/smpng/sys/netinet6/nd6.c#30 edit

Differences ...

==== //depot/projects/smpng/sys/netinet6/nd6.c#30 (text+ko) ====

@@ -398,7 +398,7 @@
 	if (tick < 0) {
 		ln->ln_expire = 0;
 		ln->ln_ntick = 0;
-		callout_stop(&ln->ln_timer_ch);
+		callout_drain(&ln->ln_timer_ch);
 	} else {
 		ln->ln_expire = time_second + tick / hz;
 		if (tick > INT_MAX) {