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/netipsec/ipsec_mbuf.c | |
| 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/netipsec/ipsec_mbuf.c')
| -rw-r--r-- | sys/netipsec/ipsec_mbuf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c index 089a4b4..7fa291b 100644 --- a/sys/netipsec/ipsec_mbuf.c +++ b/sys/netipsec/ipsec_mbuf.c @@ -105,20 +105,20 @@ m_clone(struct mbuf *m0) * because M_MOVE_PKTHDR will smash the data * pointer and drop the M_EXT marker. */ - MGETHDR(n, M_NOWAIT, m->m_type); + MGETHDR(n, M_DONTWAIT, m->m_type); if (n == NULL) { m_freem(m0); return (NULL); } M_MOVE_PKTHDR(n, m); - MCLGET(n, M_NOWAIT); + MCLGET(n, M_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); m_freem(m0); return (NULL); } } else { - n = m_getcl(M_NOWAIT, m->m_type, m->m_flags); + n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags); if (n == NULL) { m_freem(m0); return (NULL); @@ -150,7 +150,7 @@ m_clone(struct mbuf *m0) break; off += cc; - n = m_getcl(M_NOWAIT, m->m_type, m->m_flags); + n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags); if (n == NULL) { m_freem(mfirst); m_freem(m0); @@ -210,7 +210,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off) * * NB: this ignores mbuf types. */ - MGET(n, M_NOWAIT, MT_DATA); + MGET(n, M_DONTWAIT, MT_DATA); if (n == NULL) return (NULL); n->m_next = m->m_next; /* splice new mbuf */ @@ -238,7 +238,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off) if (remain + hlen > M_TRAILINGSPACE(n)) { struct mbuf *n2; - MGET(n2, M_NOWAIT, MT_DATA); + MGET(n2, M_DONTWAIT, MT_DATA); /* NB: new mbuf is on chain, let caller free */ if (n2 == NULL) return (NULL); @@ -328,7 +328,7 @@ KASSERT(m0->m_next != NULL, ("m_pad: m0 null, len %u m_len %u", len, m0->m_len)) if (pad > M_TRAILINGSPACE(m0)) { /* Add an mbuf to the chain. */ - MGET(m1, M_NOWAIT, MT_DATA); + MGET(m1, M_DONTWAIT, MT_DATA); if (m1 == 0) { m_freem(m0); DPRINTF(("m_pad: unable to get extra mbuf\n")); |
