svn commit: r272856 - stable/10/etc

[Hiroki Sato]

Author: hrs
Date: Thu Oct  9 23:24:23 2014
New Revision: 272856
URL: https://svnweb.freebsd.org/changeset/base/272856

Log:
  MFC r265225:
  
    Move configuration of IPv6 NDP flags to a point before handling ifconfig_IF.
    This fixes a race that a non-IPv4 interface can get an EUI64 LLA even if it
    has IFDISABLED nd6 flag at boot time.

Modified:
  stable/10/etc/network.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/network.subr
==============================================================================
--- stable/10/etc/network.subr	Thu Oct  9 23:23:12 2014	(r272855)
+++ stable/10/etc/network.subr	Thu Oct  9 23:24:23 2014	(r272856)
@@ -132,13 +132,6 @@ ifconfig_up()
 		_cfg=0
 	fi
 
-	# ifconfig_IF
-	ifconfig_args=`ifconfig_getargs $1`
-	if [ -n "${ifconfig_args}" ]; then
-		eval ${IFCONFIG_CMD} $1 ${ifconfig_args}
-		_cfg=0
-	fi
-
 	# inet6 specific
 	if ! noafif $1 && afexists inet6; then
 		if checkyesno ipv6_activate_all_interfaces; then
@@ -174,7 +167,17 @@ ifconfig_up()
 		if [ -n "${_ipv6_opts}" ]; then
 			${IFCONFIG_CMD} $1 inet6 ${_ipv6_opts}
 		fi
+	fi
 
+	# ifconfig_IF
+	ifconfig_args=`ifconfig_getargs $1`
+	if [ -n "${ifconfig_args}" ]; then
+		eval ${IFCONFIG_CMD} $1 ${ifconfig_args}
+		_cfg=0
+	fi
+
+	# inet6 specific
+	if ! noafif $1 && afexists inet6; then
 		# ifconfig_IF_ipv6
 		ifconfig_args=`ifconfig_getargs $1 ipv6`
 		if [ -n "${ifconfig_args}" ]; then