Author: hrs
Date: Fri May 16 14:48:21 2014
New Revision: 266225
URL: http://svnweb.freebsd.org/changeset/base/266225
Log:
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:
head/etc/network.subr
Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr Fri May 16 14:47:18 2014 (r266224)
+++ head/etc/network.subr Fri May 16 14:48:21 2014 (r266225)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
