Date: Tue, 18 Dec 2012 07:00:01 +0000 (UTC) From: Bryan Venteicher <bryanv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244380 - projects/vmxnet/sys/dev/vmware/vmxnet Message-ID: <201212180700.qBI701YZ078420@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212180700.qBI701YZ078420>