From owner-svn-src-stable-8@FreeBSD.ORG  Mon Nov  9 15:11:37 2009
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A0B61065679;
	Mon,  9 Nov 2009 15:11:37 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 681DE8FC2A;
	Mon,  9 Nov 2009 15:11:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9FBbcB024992;
	Mon, 9 Nov 2009 15:11:37 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9FBbvg024990;
	Mon, 9 Nov 2009 15:11:37 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <200911091511.nA9FBbvg024990@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Mon, 9 Nov 2009 15:11:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199085 - stable/8/sys/netinet6
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 15:11:37 -0000

Author: ume
Date: Mon Nov  9 15:11:37 2009
New Revision: 199085
URL: http://svn.freebsd.org/changeset/base/199085

Log:
  MFC r198976, r198993:
   - Don't call LLE_FREE() after nd6_free().
   - Make nd6_llinfo_timer() does its job, again.  ln->la_expire was
     greater than time_second, in most cases.

Modified:
  stable/8/sys/netinet6/nd6.c   (contents, props changed)

Modified: stable/8/sys/netinet6/nd6.c
==============================================================================
--- stable/8/sys/netinet6/nd6.c	Mon Nov  9 14:26:23 2009	(r199084)
+++ stable/8/sys/netinet6/nd6.c	Mon Nov  9 15:11:37 2009	(r199085)
@@ -502,12 +502,13 @@ nd6_llinfo_timer(void *arg)
 
 	ndi = ND_IFINFO(ifp);
 	dst = &L3_ADDR_SIN6(ln)->sin6_addr;
-	if ((ln->la_flags & LLE_STATIC) || (ln->la_expire > time_second)) {
+	if (ln->la_flags & LLE_STATIC) {
 		goto done;
 	}
 
 	if (ln->la_flags & LLE_DELETED) {
 		(void)nd6_free(ln, 0);
+		ln = NULL;
 		goto done;
 	}