svn commit: r199085 - stable/8/sys/netinet6

[Hajimu UMEMOTO]

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;
 	}