svn commit: r222639 - user/hrs/ipv6/sys/netinet6
Hiroki Sato
hrs at FreeBSD.org
Fri Jun 3 05:57:53 UTC 2011
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)
More information about the svn-src-user
mailing list