svn commit: r294583 - projects/vnet/sys/netinet

[Bjoern A. Zeeb]

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

Log:
  MFp4 @180887:
  
    With pr_destroy being gone, call ip_destroy from an ordered
    VNET_SYSUNINT.  Make ip_destroy() static.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/netinet/ip_input.c
  projects/vnet/sys/netinet/ip_var.h

Modified: projects/vnet/sys/netinet/ip_input.c
==============================================================================
--- projects/vnet/sys/netinet/ip_input.c	Fri Jan 22 18:10:36 2016	(r294582)
+++ projects/vnet/sys/netinet/ip_input.c	Fri Jan 22 18:22:03 2016	(r294583)
@@ -361,8 +361,8 @@ ip_init(void)
 }
 
 #ifdef VIMAGE
-void
-ip_destroy(void)
+static void
+ip_destroy(void *unused __unused)
 {
 	int error;
 
@@ -388,6 +388,8 @@ ip_destroy(void)
 	/* Destroy IP reassembly queue. */
 	ipreass_destroy();
 }
+
+VNET_SYSUNINIT(ip, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, ip_destroy, NULL);
 #endif
 
 #ifdef	RSS

Modified: projects/vnet/sys/netinet/ip_var.h
==============================================================================
--- projects/vnet/sys/netinet/ip_var.h	Fri Jan 22 18:10:36 2016	(r294582)
+++ projects/vnet/sys/netinet/ip_var.h	Fri Jan 22 18:22:03 2016	(r294583)
@@ -209,9 +209,6 @@ int	ip_fragment(struct ip *ip, struct mb
 	    u_long if_hwassist_flags);
 void	ip_forward(struct mbuf *m, int srcrt);
 void	ip_init(void);
-#ifdef VIMAGE
-void	ip_destroy(void);
-#endif
 extern int
 	(*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
 	    struct ip_moptions *);