From owner-svn-src-head@FreeBSD.ORG  Thu Apr  9 08:37:17 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3D493ED0;
 Thu,  9 Apr 2015 08:37:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 287A3DD4;
 Thu,  9 Apr 2015 08:37:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t398bGOx067817;
 Thu, 9 Apr 2015 08:37:16 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t398bGHY067816;
 Thu, 9 Apr 2015 08:37:16 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201504090837.t398bGHY067816@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 9 Apr 2015 08:37:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281293 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Apr 2015 08:37:17 -0000

Author: glebius
Date: Thu Apr  9 08:37:16 2015
New Revision: 281293
URL: https://svnweb.freebsd.org/changeset/base/281293

Log:
  Rename ip_drain_locked() to ip_drain_vnet(), since the function differs
  from ip_drain() not in locking, but in the scope of its work.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/netinet/ip_input.c

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Thu Apr  9 07:52:03 2015	(r281292)
+++ head/sys/netinet/ip_input.c	Thu Apr  9 08:37:16 2015	(r281293)
@@ -181,7 +181,7 @@ static struct mtx_padalign ipqlock[IPREA
 
 static void	maxnipq_update(void);
 static void	ipq_zone_change(void *);
-static void	ip_drain_locked(void);
+static void	ip_drain_vnet(void);
 
 static VNET_DEFINE(int, maxnipq);  /* Administrative limit on # reass queues. */
 static VNET_DEFINE(int, nipq);			/* Total # of reass queues */
@@ -397,7 +397,7 @@ ip_destroy(void)
 	/* Cleanup in_ifaddr hash table; should be empty. */
 	hashdestroy(V_in_ifaddrhashtbl, M_IFADDR, V_in_ifaddrhmask);
 
-	ip_drain_locked();
+	ip_drain_vnet();
 
 	uma_zdestroy(V_ipq_zone);
 }
@@ -1338,11 +1338,9 @@ ip_slowtimo(void)
 
 /*
  * Drain off all datagram fragments.
- *
- * Call without any IPQ locks held.
  */
 static void
-ip_drain_locked(void)
+ip_drain_vnet(void)
 {
 	int     i;
 
@@ -1365,7 +1363,7 @@ ip_drain(void)
 	VNET_LIST_RLOCK_NOSLEEP();
 	VNET_FOREACH(vnet_iter) {
 		CURVNET_SET(vnet_iter);
-		ip_drain_locked();
+		ip_drain_vnet();
 		CURVNET_RESTORE();
 	}
 	VNET_LIST_RUNLOCK_NOSLEEP();