aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge V. Neville-Neil <gnn@FreeBSD.org>2006-10-02 10:13:30 +0000
committerGeorge V. Neville-Neil <gnn@FreeBSD.org>2006-10-02 10:13:30 +0000
commit90ce6fa1c8de1d220e65aa00c18910961253498b (patch)
tree6929e01f2949b2cf8707ffd3555b3dd8529a9464
parent09a66bda908f30ebf9338a2993542f968222a586 (diff)
Notes
-rw-r--r--etc/network.subr4
-rw-r--r--sys/netinet6/in6_ifattach.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/network.subr b/etc/network.subr
index de2aaf4fda2d..ef344aeeafa8 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -41,6 +41,10 @@ ifconfig_up()
{
_cfg=1
+ if checkyesno ipv6_enable; then
+ ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1
+ fi
+
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
ifconfig $1 up
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 55ae4f2358c1..722c3fd31bfe 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -63,7 +63,7 @@ unsigned long in6_maxmtu = 0;
#ifdef IP6_AUTO_LINKLOCAL
int ip6_auto_linklocal = IP6_AUTO_LINKLOCAL;
#else
-int ip6_auto_linklocal = 1; /* enable by default */
+int ip6_auto_linklocal = 0; /* disable by default */
#endif
struct callout in6_tmpaddrtimer_ch;