svn commit: r294581 - projects/vnet/sys/netinet6

[Bjoern A. Zeeb]

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);