summaryrefslogtreecommitdiff
path: root/sys/netinet6/in6_ifattach.c
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2015-01-06 21:26:47 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2015-01-06 21:26:47 +0000
commit8953263400bf7e7728c7e71c3aeaf514002dab58 (patch)
tree2e30084b4f6cdbd45498bd432800846a72c47004 /sys/netinet6/in6_ifattach.c
parent0bea6b3be921fb4ff171bac4adacd4fd44f0900e (diff)
Remove the NOINET6 interface flag, a left-over from the times when IPv6
was enabled by default. Add AFATTACH/AFDETACH ioctls which enable/disable an address family for an interface (currently used for IPv6 only). New kernel needs new ifconfig for IPv6 configuration (address assignment still works with old ifconfig making this easy to cross over). Committing on behalf of henning@ who is currently lebensmittelvergiftet. ok stsp, benno, mpi
Diffstat (limited to 'sys/netinet6/in6_ifattach.c')
-rw-r--r--sys/netinet6/in6_ifattach.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 6f36b1e3418..21506198a0d 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_ifattach.c,v 1.78 2014/12/04 00:02:15 tedu Exp $ */
+/* $OpenBSD: in6_ifattach.c,v 1.79 2015/01/06 21:26:46 stsp Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -617,6 +617,8 @@ in6_ifdetach(struct ifnet *ifp)
struct rtentry *rt;
struct sockaddr_in6 sin6;
+ ifp->if_xflags &= ~IFXF_AUTOCONF6;
+
#ifdef MROUTING
/* remove ip6_mrouter stuff */
ip6_mrouter_detach(ifp);