From bf8e8a6e8f0bd9165109f0a258730dd242299815 Mon Sep 17 00:00:00 2001 From: alfred Date: Tue, 21 Jan 2003 08:56:16 +0000 Subject: Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0. Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT. --- sys/net/if_tap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/net/if_tap.c') diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index 0648200..385d6c7 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -334,7 +334,7 @@ tapcreate(dev) char *name = NULL; /* allocate driver storage and create device */ - MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_WAITOK | M_ZERO); + MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_ZERO); SLIST_INSERT_HEAD(&taphead, tp, tap_next); unit = dev2unit(dev) & TAPMAXUNIT; @@ -849,7 +849,7 @@ tapwrite(dev, uio, flag) tlen = uio->uio_resid; /* get a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) return (ENOBUFS); mlen = MHLEN; @@ -862,7 +862,7 @@ tapwrite(dev, uio, flag) *mp = m; mp = &m->m_next; if (uio->uio_resid > 0) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, M_NOWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; break; -- cgit v1.1