From owner-svn-src-projects@FreeBSD.ORG  Tue Dec 18 07:00:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 13E9476B;
 Tue, 18 Dec 2012 07:00:02 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EB8B88FC0C;
 Tue, 18 Dec 2012 07:00:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI701f4078421;
 Tue, 18 Dec 2012 07:00:01 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI701YZ078420;
 Tue, 18 Dec 2012 07:00:01 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201212180700.qBI701YZ078420@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 18 Dec 2012 07:00:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244380 - projects/vmxnet/sys/dev/vmware/vmxnet
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.14
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 07:00:02 -0000

Author: bryanv
Date: Tue Dec 18 07:00:01 2012
New Revision: 244380
URL: http://svnweb.freebsd.org/changeset/base/244380

Log:
  Use the modern malloc(9) flags
  
  Requested by:	glebius
  Approved by:	grehan (implicit)

Modified:
  projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c

Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Tue Dec 18 06:55:13 2012	(r244379)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Tue Dec 18 07:00:01 2012	(r244380)
@@ -1002,7 +1002,7 @@ vic_encap_load_mbuf(struct vic_softc *sc
 	} else if (error != EFBIG)
 		return (error);
 
-	m = m_collapse(m, M_DONTWAIT, maxsegs);
+	m = m_collapse(m, M_NOWAIT, maxsegs);
 	if (m != NULL) {
 		*m0 = m;
 		error = bus_dmamap_load_mbuf_sg(tag, dmap, m, segs, nsegs, 0);
@@ -1355,7 +1355,7 @@ vic_newbuf(struct vic_softc *sc, struct 
 	frag = &sc->vic_rxq[0] != rxq;
 #endif
 
-	m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rxq->pktlen);
+	m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->pktlen);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = rxq->pktlen;