From owner-svn-src-user@FreeBSD.ORG  Fri Jun  3 05:57:53 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A0F4106566C;
	Fri,  3 Jun 2011 05:57:53 +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 5BCA48FC14;
	Fri,  3 Jun 2011 05:57:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p535vrLM050449;
	Fri, 3 Jun 2011 05:57:53 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p535vruQ050447;
	Fri, 3 Jun 2011 05:57:53 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106030557.p535vruQ050447@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 3 Jun 2011 05:57:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222639 - user/hrs/ipv6/sys/netinet6
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2011 05:57:53 -0000

Author: hrs
Date: Fri Jun  3 05:57:52 2011
New Revision: 222639
URL: http://svn.freebsd.org/changeset/base/222639

Log:
  - style(9) fixes.
  - Do break immediately as a link-local address is found.
  
  Submitted by:	bz

Modified:
  user/hrs/ipv6/sys/netinet6/nd6.c

Modified: user/hrs/ipv6/sys/netinet6/nd6.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/nd6.c	Fri Jun  3 05:56:52 2011	(r222638)
+++ user/hrs/ipv6/sys/netinet6/nd6.c	Fri Jun  3 05:57:52 2011	(r222639)
@@ -1328,7 +1328,7 @@ nd6_ioctl(u_long cmd, caddr_t data, stru
 		 */
 		if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
 		    (ND.flags & (ND6_IFF_ACCEPT_RTADV |
-				 ND6_IFF_AUTO_LINKLOCAL)))
+			    ND6_IFF_AUTO_LINKLOCAL)))
 			ND.flags &= ~ND6_IFF_IFDISABLED;
 
 		if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
@@ -1349,7 +1349,7 @@ nd6_ioctl(u_long cmd, caddr_t data, stru
 					continue;
 				ia = (struct in6_ifaddr *)ifa;
 				if ((ia->ia6_flags & IN6_IFF_DUPLICATED) &&
-				    IN6_IS_ADDR_LINKLOCAL(&ia->ia_addr.sin6_addr)) {
+				    IN6_IS_ADDR_LINKLOCAL(IA6_IN6(ia)))
 					duplicated_linklocal = 1;
 					break;
 				}
@@ -1401,8 +1401,10 @@ nd6_ioctl(u_long cmd, caddr_t data, stru
 				if (ifa->ifa_addr->sa_family != AF_INET6)
 					continue;
 				ia = (struct in6_ifaddr *)ifa;
-				if (IN6_IS_ADDR_LINKLOCAL(&(ia->ia_addr.sin6_addr)))
+				if (IN6_IS_ADDR_LINKLOCAL(IA6_IN6(ia))) {
 					haslinklocal = 1;
+					break;
+				}
 			}
 			IF_ADDR_UNLOCK(ifp);
 			if (!haslinklocal)