svn commit: r222734 - head/sys/netinet6

[Hiroki Sato]

Author: hrs
Date: Mon Jun  6 04:12:57 2011
New Revision: 222734
URL: http://svn.freebsd.org/changeset/base/222734

Log:
  Do not activate automatic LL addr configuration when 0/1->1 transition of
  ND6_IFF_IFDISABLED flag.

Modified:
  head/sys/netinet6/nd6.c

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Mon Jun  6 03:37:33 2011	(r222733)
+++ head/sys/netinet6/nd6.c	Mon Jun  6 04:12:57 2011	(r222734)
@@ -1327,6 +1327,7 @@ nd6_ioctl(u_long cmd, caddr_t data, stru
 		 * accept_rtadv or auto_linklocal.
 		 */
 		if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
+		    !(ND.flags & ND6_IFF_IFDISABLED) &&
 		    (ND.flags & (ND6_IFF_ACCEPT_RTADV |
 		    ND6_IFF_AUTO_LINKLOCAL)))
 			ND.flags &= ~ND6_IFF_IFDISABLED;
@@ -1388,7 +1389,8 @@ nd6_ioctl(u_long cmd, caddr_t data, stru
 			/* If no link-local address on ifp, configure */
 			ND_IFINFO(ifp)->flags |= ND6_IFF_AUTO_LINKLOCAL;
 			in6_ifattach(ifp, NULL);
-		} else if (ND_IFINFO(ifp)->flags & ND6_IFF_AUTO_LINKLOCAL) {
+		} else if ((ND_IFINFO(ifp)->flags & ND6_IFF_AUTO_LINKLOCAL) &&
+		    !(ND.flags & ND6_IFF_IFDISABLED)) {
 			/*
 			 * When the IF already has
 			 * ND6_IFF_AUTO_LINKLOCAL and no link-local