svn commit: r197996 - head/sys/netinet6
Hiroki Sato
hrs at FreeBSD.org
Mon Oct 12 18:54:03 UTC 2009
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);
}
More information about the svn-src-all
mailing list