diff options
Diffstat (limited to 'sys/contrib/dev')
| -rw-r--r-- | sys/contrib/dev/fla/fla.c | 2 | ||||
| -rw-r--r-- | sys/contrib/dev/oltr/if_oltr.c | 8 |
2 files changed, 5 insertions, 5 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); |
