From owner-svn-src-all@FreeBSD.ORG  Sun Nov 28 14:57:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B622D1065672;
	Sun, 28 Nov 2010 14:57:37 +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 A43708FC1B;
	Sun, 28 Nov 2010 14:57: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 oASEvb6G022113;
	Sun, 28 Nov 2010 14:57:37 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oASEvb8C022111;
	Sun, 28 Nov 2010 14:57:37 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201011281457.oASEvb8C022111@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 28 Nov 2010 14:57: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: r215999 - stable/8/sys/netinet6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Nov 2010 14:57:37 -0000

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