diff options
| author | hrs <hrs@FreeBSD.org> | 2014-10-09 23:24:23 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2014-10-09 23:24:23 +0000 |
| commit | 90b42277dc21c65fc9805c42b5eddde0edb59b76 (patch) | |
| tree | c0214361360c0256e33c1a508cebb560e0b6f21e | |
| parent | afd3460b013c46ed54db05663919efeff08de40c (diff) | |
| download | FreeBSD-src-90b42277dc21c65fc9805c42b5eddde0edb59b76.zip FreeBSD-src-90b42277dc21c65fc9805c42b5eddde0edb59b76.tar.gz | |
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.
| -rw-r--r-- | etc/network.subr | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/etc/network.subr b/etc/network.subr index bb40eb4..c500041 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -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 |
