d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not set ND6_IFF_ACCEPT_RTADV on if_bridge(4) interfaces when

Browse Source 
ipv6_enable=yes.

MFC after:	3 days
This commit is contained in:
Hiroki Sato 2013-07-21 15:26:25 +00:00
parent 9ae3241587
commit 0d6d097a5f
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
etc/network.subr
View File

@ -113,9 +113,18 @@ ifconfig_up()
# backward compatibility: $ipv6_enable
case $ipv6_enable in
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
if ! checkyesno ipv6_gateway_enable; then
_ipv6_opts="${_ipv6_opts} accept_rtadv"
fi
case $1 in
bridge[0-9]*)
# No accept_rtadv by default on if_bridge(4)
# to avoid a conflict with the member
# interfaces.
;;
*)
if ! checkyesno ipv6_gateway_enable; then
_ipv6_opts="${_ipv6_opts} accept_rtadv"
fi
;;
esac
;;
esac
@ -550,9 +559,18 @@ ipv6_autoconfif()
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
if checkyesno ipv6_gateway_enable; then
return 1
else
return 0
fi
case $1 in
bridge[0-9]*)
# No accept_rtadv by default on if_bridge(4)
# to avoid a conflict with the member
# interfaces.
return 1
;;
*)
return 0
;;
esac
;;
esac