diff options
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/dev/fla/fla.c | 2 | ||||
-rw-r--r-- | sys/contrib/dev/oltr/if_oltr.c | 8 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/fil.c | 6 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.c | 18 |
4 files changed, 17 insertions, 17 deletions
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c index ac2a8ab..3ed9f71 100644 --- a/sys/contrib/dev/fla/fla.c +++ b/sys/contrib/dev/fla/fla.c @@ -65,7 +65,7 @@ static struct cdevsw fladisk_cdevsw; void * doc2k_malloc(int bytes) { - return malloc(bytes, M_FLA, M_WAITOK); + return malloc(bytes, M_FLA, 0); } void diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index a4b1a82..ea4dcc3 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -1405,14 +1405,14 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount if (sc->state > OL_CLOSED) { if (ReceiveStatus == TRLLD_RCV_OK) { - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, M_NOWAIT, MT_DATA); mbuf_size = MHLEN - 2; if (!m0) { ifp->if_ierrors++; goto dropped; } if (ByteCount + 2 > MHLEN) { - MCLGET(m0, M_DONTWAIT); + MCLGET(m0, M_NOWAIT); mbuf_size = MCLBYTES - 2; if (!(m0->m_flags & M_EXT)) { m_freem(m0); @@ -1447,7 +1447,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount frag_offset = 0; } if ((mbuf_offset == mbuf_size) && (frame_len > 0)) { - MGET(m1, M_DONTWAIT, MT_DATA); + MGET(m1, M_NOWAIT, MT_DATA); mbuf_size = MHLEN; if (!m1) { ifp->if_ierrors++; @@ -1455,7 +1455,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount goto dropped; } if (frame_len > MHLEN) { - MCLGET(m1, M_DONTWAIT); + MCLGET(m1, M_NOWAIT); mbuf_size = MCLBYTES; if (!(m1->m_flags & M_EXT)) { m_freem(m0); diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 434e9e6..96432a1 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -1188,7 +1188,7 @@ logit: mc = dupmsg(m); # else # if defined(__OpenBSD__) && (OpenBSD >= 199905) - mc = m_copym2(m, 0, M_COPYALL, M_DONTWAIT); + mc = m_copym2(m, 0, M_COPYALL, M_NOWAIT); # else mc = m_copy(m, 0, M_COPYALL); # endif @@ -1587,7 +1587,7 @@ m_copyback(m0, off, len, cp) off -= mlen; totlen += mlen; if (m->m_next == 0) { - n = m_getclr(M_DONTWAIT, m->m_type); + n = m_getclr(M_NOWAIT, m->m_type); if (n == 0) goto out; n->m_len = min(MLEN, len + off); @@ -1606,7 +1606,7 @@ m_copyback(m0, off, len, cp) if (len == 0) break; if (m->m_next == 0) { - n = m_get(M_DONTWAIT, m->m_type); + n = m_get(M_NOWAIT, m->m_type); if (n == 0) break; n->m_len = min(MLEN, len); diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c index f7f6352..da64a49 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.c +++ b/sys/contrib/ipfilter/netinet/ip_fil.c @@ -1160,9 +1160,9 @@ fr_info_t *fin; if (tcp->th_flags & TH_RST) return -1; /* feedback loop */ # if (BSD < 199306) || defined(__sgi) - m = m_get(M_DONTWAIT, MT_HEADER); + m = m_get(M_NOWAIT, MT_HEADER); # else - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(M_NOWAIT, MT_HEADER); # endif if (m == NULL) return ENOBUFS; @@ -1337,10 +1337,10 @@ int dst; # if (BSD < 199306) || defined(__sgi) avail = MLEN; - m = m_get(M_DONTWAIT, MT_HEADER); + m = m_get(M_NOWAIT, MT_HEADER); # else avail = MHLEN; - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(M_NOWAIT, MT_HEADER); # endif if (m == NULL) return ENOBUFS; @@ -1364,11 +1364,11 @@ int dst; if (type == ICMP6_DST_UNREACH) code = icmptoicmp6unreach[code]; - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, M_NOWAIT, MT_HEADER); if (!m) return ENOBUFS; - MCLGET(m, M_DONTWAIT); + MCLGET(m, M_NOWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); return ENOBUFS; @@ -1564,7 +1564,7 @@ frdest_t *fdp; * problem. */ if (M_WRITABLE(m) == 0) { - if ((m0 = m_dup(m, M_DONTWAIT)) != NULL) { + if ((m0 = m_dup(m, M_NOWAIT)) != NULL) { m_freem(*mpp); *mpp = m0; m = m0; @@ -1747,9 +1747,9 @@ frdest_t *fdp; mhlen = sizeof (struct ip); for (off = hlen + len; off < ip->ip_len; off += len) { # ifdef MGETHDR - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, M_NOWAIT, MT_HEADER); # else - MGET(m, M_DONTWAIT, MT_HEADER); + MGET(m, M_NOWAIT, MT_HEADER); # endif if (m == 0) { error = ENOBUFS; |