From owner-svn-src-head@FreeBSD.ORG  Fri Oct  2 07:00:20 2009
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 68705106566B;
	Fri,  2 Oct 2009 07:00:20 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 577CD8FC16;
	Fri,  2 Oct 2009 07:00:20 +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 n9270Kfr092490;
	Fri, 2 Oct 2009 07:00:20 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9270KiU092488;
	Fri, 2 Oct 2009 07:00:20 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <200910020700.n9270KiU092488@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 2 Oct 2009 07:00:20 +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: r197703 - 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: Fri, 02 Oct 2009 07:00:20 -0000

Author: hrs
Date: Fri Oct  2 07:00:20 2009
New Revision: 197703
URL: http://svn.freebsd.org/changeset/base/197703

Log:
  Enable adding a link-local address even if ND6_IFF_IFDISABLED.
  Note that when the interface has ND6_IFF_IFDISABLED, a newly-added
  address is always marked as IN6_IFF_TENTATIVE so that the interface
  can perform DAD after the ND6_IFF_IFDISABLED is cleared.

Modified:
  head/sys/netinet6/in6_ifattach.c

Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c	Fri Oct  2 06:51:39 2009	(r197702)
+++ head/sys/netinet6/in6_ifattach.c	Fri Oct  2 07:00:20 2009	(r197703)
@@ -751,7 +751,6 @@ in6_ifattach(struct ifnet *ifp, struct i
 	 * assign a link-local address, if there's none.
 	 */
 	if (ifp->if_type != IFT_BRIDGE &&
-	    !(ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
 	    ND_IFINFO(ifp)->flags & ND6_IFF_AUTO_LINKLOCAL) {
 		int error;