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

[Bjoern A. Zeeb]

Author: bz
Date: Sun Nov 28 14:57:37 2010
New Revision: 215999
URL: http://svn.freebsd.org/changeset/base/215999

Log:
  MFC r215418:
  
    No need to re-initialize the callout.  We initially do it in in6_lltable_new()
    right after allocation.  Worse, we are losing the right flags here.

Modified:
  stable/8/sys/netinet6/nd6.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet6/nd6.c
==============================================================================
--- stable/8/sys/netinet6/nd6.c	Sun Nov 28 14:55:00 2010	(r215998)
+++ stable/8/sys/netinet6/nd6.c	Sun Nov 28 14:57:37 2010	(r215999)
@@ -847,10 +847,8 @@ nd6_lookup(struct in6_addr *addr6, int f
 	    llflags |= LLE_EXCLUSIVE;	
 	
 	ln = lla_lookup(LLTABLE6(ifp), llflags, (struct sockaddr *)&sin6);
-	if ((ln != NULL) && (flags & LLE_CREATE)) {
+	if ((ln != NULL) && (flags & LLE_CREATE))
 		ln->ln_state = ND6_LLINFO_NOSTATE;
-		callout_init(&ln->ln_timer_ch, 0);
-	}
 	
 	return (ln);
 }