From owner-svn-src-head@FreeBSD.ORG  Tue Apr 10 06:52:21 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADC9C106566B;
	Tue, 10 Apr 2012 06:52:21 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 977448FC08;
	Tue, 10 Apr 2012 06:52:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3A6qLeY008182;
	Tue, 10 Apr 2012 06:52:21 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3A6qLkx008180;
	Tue, 10 Apr 2012 06:52:21 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204100652.q3A6qLkx008180@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 10 Apr 2012 06:52:21 +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: r234086 - head/sys/dev/sfxge
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 10 Apr 2012 06:52:21 -0000

Author: glebius
Date: Tue Apr 10 06:52:21 2012
New Revision: 234086
URL: http://svn.freebsd.org/changeset/base/234086

Log:
  M_DONTWAIT is a flag from historical mbuf(9)
  allocator, not malloc(9) or uma(9) flag.

Modified:
  head/sys/dev/sfxge/sfxge_rx.c

Modified: head/sys/dev/sfxge/sfxge_rx.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_rx.c	Tue Apr 10 06:25:11 2012	(r234085)
+++ head/sys/dev/sfxge/sfxge_rx.c	Tue Apr 10 06:52:21 2012	(r234086)
@@ -176,10 +176,10 @@ static inline struct mbuf *sfxge_rx_allo
 	/* Allocate mbuf structure */
 	args.flags = M_PKTHDR;
 	args.type = MT_DATA;
-	m = (struct mbuf *)uma_zalloc_arg(zone_mbuf, &args, M_DONTWAIT);
+	m = (struct mbuf *)uma_zalloc_arg(zone_mbuf, &args, M_NOWAIT);
 
 	/* Allocate (and attach) packet buffer */
-	if (m && !uma_zalloc_arg(sc->rx_buffer_zone, m, M_DONTWAIT)) {
+	if (m && !uma_zalloc_arg(sc->rx_buffer_zone, m, M_NOWAIT)) {
 		uma_zfree(zone_mbuf, m);
 		m = NULL;
 	}
@@ -586,7 +586,7 @@ static void sfxge_lro_new_conn(struct sf
 		c = TAILQ_FIRST(&st->free_conns);
 		TAILQ_REMOVE(&st->free_conns, c, link);
 	} else {
-		c = malloc(sizeof(*c), M_SFXGE, M_DONTWAIT);
+		c = malloc(sizeof(*c), M_SFXGE, M_NOWAIT);
 		if (c == NULL)
 			return;
 		c->mbuf = NULL;