From c0371154d2afccceb1984c6189f232f3897315f9 Mon Sep 17 00:00:00 2001
From: florian <florian@openbsd.org>
Date: Thu, 8 Jan 2015 17:21:01 +0000
Subject: [PATCH] Clear autoconf6 flag after autoconf6 cleanup happened, not
 before. Otherwise clean up code will never run. OK mpi@, benno@, henning@

---
 sys/netinet6/in6_ifattach.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 21506198a0d..52f779eace7 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_ifattach.c,v 1.79 2015/01/06 21:26:46 stsp Exp $	*/
+/*	$OpenBSD: in6_ifattach.c,v 1.80 2015/01/08 17:21:01 florian Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $	*/
 
 /*
@@ -617,8 +617,6 @@ 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);
@@ -692,5 +690,6 @@ in6_ifdetach(struct ifnet *ifp)
 		if (RS_LHCOOKIE(ifp) != NULL)
 			hook_disestablish(ifp->if_linkstatehooks,
 			    RS_LHCOOKIE(ifp));
+		ifp->if_xflags &= ~IFXF_AUTOCONF6;
 	}
 }
-- 
2.20.1