From owner-svn-src-projects@freebsd.org  Fri Jan 22 18:09:27 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D730A8CA9A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 22 Jan 2016 18:09:27 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 30E9D1D55;
 Fri, 22 Jan 2016 18:09:27 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MI9Qen070349;
 Fri, 22 Jan 2016 18:09:26 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MI9QSU070347;
 Fri, 22 Jan 2016 18:09:26 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201601221809.u0MI9QSU070347@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 22 Jan 2016 18:09:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r294581 - projects/vnet/sys/netinet6
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2016 18:09:27 -0000

Author: bz
Date: Fri Jan 22 18:09:25 2016
New Revision: 294581
URL: https://svnweb.freebsd.org/changeset/base/294581

Log:
  MFp4 @180892:
  
  	With pr_destroy being gone, call ip6_destroy from an ordered
  	NET_SYSUNINT.  Make ip6_destroy() static as well.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/netinet6/ip6_input.c
  projects/vnet/sys/netinet6/ip6_var.h

Modified: projects/vnet/sys/netinet6/ip6_input.c
==============================================================================
--- projects/vnet/sys/netinet6/ip6_input.c	Fri Jan 22 18:06:09 2016	(r294580)
+++ projects/vnet/sys/netinet6/ip6_input.c	Fri Jan 22 18:09:25 2016	(r294581)
@@ -305,8 +305,8 @@ ip6proto_unregister(short ip6proto)
 }
 
 #ifdef VIMAGE
-void
-ip6_destroy()
+static void
+ip6_destroy(void *unused __unused)
 {
 	int error;
 
@@ -329,6 +329,8 @@ ip6_destroy()
 	nd6_destroy();
 	in6_ifattach_destroy();
 }
+
+VNET_SYSUNINIT(inet6, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, ip6_destroy, NULL);
 #endif
 
 static int

Modified: projects/vnet/sys/netinet6/ip6_var.h
==============================================================================
--- projects/vnet/sys/netinet6/ip6_var.h	Fri Jan 22 18:06:09 2016	(r294580)
+++ projects/vnet/sys/netinet6/ip6_var.h	Fri Jan 22 18:09:25 2016	(r294581)
@@ -354,9 +354,6 @@ int	icmp6_ctloutput(struct socket *, str
 
 struct in6_ifaddr;
 void	ip6_init(void);
-#ifdef VIMAGE
-void	ip6_destroy(void);
-#endif
 int	ip6proto_register(short);
 int	ip6proto_unregister(short);