From owner-svn-src-projects@FreeBSD.ORG  Wed Sep 30 00:26:43 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7674F1065679;
	Wed, 30 Sep 2009 00:26:43 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 66D658FC18;
	Wed, 30 Sep 2009 00:26:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U0Qhax000196;
	Wed, 30 Sep 2009 00:26:43 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U0Qhiw000194;
	Wed, 30 Sep 2009 00:26:43 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200909300026.n8U0Qhiw000194@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Wed, 30 Sep 2009 00:26:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197629 - projects/tcp_ffcaia2008_8.x/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Sep 2009 00:26:43 -0000

Author: lstewart
Date: Wed Sep 30 00:26:43 2009
New Revision: 197629
URL: http://svn.freebsd.org/changeset/base/197629

Log:
  msleep() is deprecated in favour of mtx_sleep().
  
  Sponsored by:	FreeBSD Foundation

Modified:
  projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c

Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c	Tue Sep 29 23:59:12 2009	(r197628)
+++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c	Wed Sep 30 00:26:43 2009	(r197629)
@@ -536,7 +536,11 @@ siftr_pkt_manager_thread(void *arg)
 		 * Sleep until we are signalled to wake because thread has
 		 * been told to exit or until 1 tick has passed.
 		 */
-		msleep(&wait_for_pkt, &siftr_pkt_mgr_mtx, PWAIT, "pktwait", 1);
+		mtx_sleep(&wait_for_pkt,
+		    &siftr_pkt_mgr_mtx,
+		    PWAIT,
+		    "pktwait",
+		    1);
 
 		/* Gain exclusive access to the pkt_node queue. */
 		mtx_lock(&siftr_pkt_queue_mtx);
@@ -1304,7 +1308,7 @@ siftr_manage_ops(uint8_t action)
 		wakeup(&wait_for_pkt);
 
 		/* Wait for the pkt_manager thread to exit. */
-		msleep(siftr_pkt_manager_thr,
+		mtx_sleep(siftr_pkt_manager_thr,
 		    &siftr_pkt_mgr_mtx,
 		    PWAIT,
 		    "thrwait",