Date: Wed, 17 Jul 2013 13:24:10 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253422 - stable/9/etc Message-ID: <201307171324.r6HDOApT092838@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Jul 17 13:24:10 2013 New Revision: 253422 URL: http://svnweb.freebsd.org/changeset/base/253422 Log: MFC r230453: - Configurations in ipv6_prefix_IF should be recognized even if there is no ifconfig_IF_ipv6. - DAD wait should be performed at once, not on a per-interface basis, if possible. This fixes an issue that a system with a lot of IPv6-capable interfaces takes too long for booting. Approved by: re (glebius) Modified: stable/9/etc/network.subr Directory Properties: stable/9/etc/ (props changed) Modified: stable/9/etc/network.subr ============================================================================== --- stable/9/etc/network.subr Wed Jul 17 13:13:44 2013 (r253421) +++ stable/9/etc/network.subr Wed Jul 17 13:24:10 2013 (r253422) @@ -116,7 +116,7 @@ ifconfig_up() if ! checkyesno ipv6_gateway_enable; then _ipv6_opts="${_ipv6_opts} accept_rtadv" fi - ;; + ;; esac case $ipv6_cpe_wanif in @@ -498,6 +498,12 @@ ipv6if() return 0 fi + # True if $ipv6_prefix_IF is defined. + _tmpargs=`get_if_var $_if ipv6_prefix_IF` + if [ -n "${_tmpargs}" ]; then + return 0 + fi + # backward compatibility: True if $ipv6_ifconfig_IF is defined. _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` if [ -n "${_tmpargs}" ]; then @@ -616,10 +622,6 @@ ipv6_up() ipv6_prefix_hostid_addr_common ${_if} alias && _ret=0 ipv6_accept_rtadv_up ${_if} && _ret=0 - # wait for DAD - sleep `${SYSCTL_N} net.inet6.ip6.dad_count` - sleep 1 - return $_ret }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307171324.r6HDOApT092838>