diff options
author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/netnatm | |
parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/netnatm')
-rw-r--r-- | sys/netnatm/natm.c | 8 | ||||
-rw-r--r-- | sys/netnatm/natm_pcb.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 24b65ed..e0535b6 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -109,7 +109,7 @@ natm_usr_attach(struct socket *so, int proto, d_thread_t *p) goto out; } - so->so_pcb = (caddr_t) (npcb = npcb_alloc(0)); + so->so_pcb = (caddr_t) (npcb = npcb_alloc(M_WAITOK)); npcb->npcb_socket = so; out: splx(s); @@ -300,7 +300,7 @@ natm_usr_send(struct socket *so, int flags, struct mbuf *m, * send the data. we must put an atm_pseudohdr on first */ - M_PREPEND(m, sizeof(*aph), 0); + M_PREPEND(m, sizeof(*aph), M_TRYWAIT); if (m == NULL) { error = ENOBUFS; goto out; @@ -469,7 +469,7 @@ struct proc *p; break; } - so->so_pcb = (caddr_t) (npcb = npcb_alloc(0)); + so->so_pcb = (caddr_t) (npcb = npcb_alloc(M_WAITOK)); npcb->npcb_socket = so; break; @@ -599,7 +599,7 @@ struct proc *p; * send the data. we must put an atm_pseudohdr on first */ - M_PREPEND(m, sizeof(*aph), 0); + M_PREPEND(m, sizeof(*aph), M_TRYWAIT); if (m == NULL) { error = ENOBUFS; break; diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c index 9fee1b0..7016e33 100644 --- a/sys/netnatm/natm_pcb.c +++ b/sys/netnatm/natm_pcb.c @@ -66,7 +66,7 @@ int wait; MALLOC(npcb, struct natmpcb *, sizeof(*npcb), M_PCB, wait | M_ZERO); #ifdef DIAGNOSTIC - if (wait == 0 && npcb == NULL) panic("npcb_alloc: malloc didn't wait"); + if (wait == M_WAITOK && npcb == NULL) panic("npcb_alloc: malloc didn't wait"); #endif if (npcb) |