From owner-svn-src-head@FreeBSD.ORG  Wed Nov 17 09:25:08 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AEE361065672;
	Wed, 17 Nov 2010 09:25:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D4978FC1F;
	Wed, 17 Nov 2010 09:25:08 +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 oAH9P8tw084667;
	Wed, 17 Nov 2010 09:25:08 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAH9P8Lq084665;
	Wed, 17 Nov 2010 09:25:08 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201011170925.oAH9P8Lq084665@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 17 Nov 2010 09:25:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215418 - head/sys/netinet6
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Nov 2010 09:25:08 -0000

Author: bz
Date: Wed Nov 17 09:25:08 2010
New Revision: 215418
URL: http://svn.freebsd.org/changeset/base/215418

Log:
  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.
  
  MFC after:	4 days

Modified:
  head/sys/netinet6/nd6.c

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Wed Nov 17 08:56:01 2010	(r215417)
+++ head/sys/netinet6/nd6.c	Wed Nov 17 09:25:08 2010	(r215418)
@@ -851,10 +851,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);
 }