diff options
| author | hrs <hrs@FreeBSD.org> | 2009-10-12 18:54:02 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2009-10-12 18:54:02 +0000 |
| commit | 62171fd4d3b951ffba3e889e4bcd1c08cec0998e (patch) | |
| tree | 35bb723c35e800abb6e7879765640d9697cca8e7 | |
| parent | 41b941dc808971620b6545750e58a2eea0b0ca4b (diff) | |
| download | FreeBSD-src-62171fd4d3b951ffba3e889e4bcd1c08cec0998e.zip FreeBSD-src-62171fd4d3b951ffba3e889e4bcd1c08cec0998e.tar.gz | |
- 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).
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index c77b93f..5041ee2 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -751,16 +751,19 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp) * 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); } |
