From owner-svn-src-projects@freebsd.org  Fri Jan 22 18:22:05 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 6CDDFA8D0A6
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 22 Jan 2016 18:22:05 +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 3C2C117E3;
 Fri, 22 Jan 2016 18:22:05 +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 u0MIM44S075268;
 Fri, 22 Jan 2016 18:22:04 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIM4DL075266;
 Fri, 22 Jan 2016 18:22:04 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201601221822.u0MIM4DL075266@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:22:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r294583 - projects/vnet/sys/netinet
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:22:05 -0000

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