From owner-svn-src-head@FreeBSD.ORG  Mon Oct 12 18:54:02 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 E8211106568D;
	Mon, 12 Oct 2009 18:54:02 +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 D8AE08FC0C;
	Mon, 12 Oct 2009 18:54:02 +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 n9CIs2sG080744;
	Mon, 12 Oct 2009 18:54:02 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9CIs2hg080743;
	Mon, 12 Oct 2009 18:54:02 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <200910121854.n9CIs2hg080743@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 12 Oct 2009 18:54:02 +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: r197996 - 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: Mon, 12 Oct 2009 18:54:03 -0000

Author: hrs
Date: Mon Oct 12 18:54:02 2009
New Revision: 197996
URL: http://svn.freebsd.org/changeset/base/197996

Log:
  - Do not assign a link-local address when ND6_IFF_IFDISABLED.
    Adding a tentative address is useless.
  
  - Comment out a confused warning message when
    in6_ifattach_linklocal() fails.  This can occur when the
    interface does not support ioctl(SIOCAIFADDR) (interfaces
    associated with 802.11 wireless network device drivers, for
    example).

Modified:
  head/sys/netinet6/in6_ifattach.c

Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c	Mon Oct 12 17:10:51 2009	(r197995)
+++ head/sys/netinet6/in6_ifattach.c	Mon Oct 12 18:54:02 2009	(r197996)
@@ -751,16 +751,19 @@ 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;
 
 		ia = in6ifa_ifpforlinklocal(ifp, 0);
 		if (ia == NULL) {
 			error = in6_ifattach_linklocal(ifp, altifp);
+#if 0
 			if (error)
 				log(LOG_NOTICE, "in6_ifattach_linklocal: "
 				    "failed to add a link-local addr to %s\n",
 				    if_name(ifp));
+#endif
 		} else
 			ifa_free(&ia->ia_ifa);
 	}