From owner-svn-src-all@FreeBSD.ORG  Fri Jun 11 20:59:30 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 00D19106567B;
	Fri, 11 Jun 2010 20:59:30 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4CE98FC17;
	Fri, 11 Jun 2010 20:59:29 +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 o5BKxT83088475;
	Fri, 11 Jun 2010 20:59:29 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5BKxTNU088473;
	Fri, 11 Jun 2010 20:59:29 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201006112059.o5BKxTNU088473@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Fri, 11 Jun 2010 20:59:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209070 - head/sys/dev/ixgbe
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jun 2010 20:59:30 -0000

Author: jfv
Date: Fri Jun 11 20:59:29 2010
New Revision: 209070
URL: http://svn.freebsd.org/changeset/base/209070

Log:
  Change the mbuf memory calls back to NOWAIT as a
  problem has been seen in one case with doing the
  M_WAITOK

Modified:
  head/sys/dev/ixgbe/ixgbe.c

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Fri Jun 11 20:56:40 2010	(r209069)
+++ head/sys/dev/ixgbe/ixgbe.c	Fri Jun 11 20:59:29 2010	(r209070)
@@ -3642,7 +3642,7 @@ ixgbe_setup_receive_ring(struct rx_ring 
 			goto skip_head;
 
 		/* First the header */
-		rxbuf->m_head = m_gethdr(M_WAITOK, MT_DATA);
+		rxbuf->m_head = m_gethdr(M_NOWAIT, MT_DATA);
 		if (rxbuf->m_head == NULL) {
 			error = ENOBUFS;
 			goto fail;
@@ -3664,7 +3664,7 @@ ixgbe_setup_receive_ring(struct rx_ring 
 
 skip_head:
 		/* Now the payload cluster */
-		rxbuf->m_pack = m_getjcl(M_WAITOK, MT_DATA,
+		rxbuf->m_pack = m_getjcl(M_NOWAIT, MT_DATA,
 		    M_PKTHDR, adapter->rx_mbuf_sz);
 		if (rxbuf->m_pack == NULL) {
 			error = ENOBUFS;