diff options
author | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
commit | 8e20fa5ae93243e19700ca06c01524b90fe3b784 (patch) | |
tree | bf083a0829f8044362fc83354c8e8b60d1f7932a /sys/netipx | |
parent | d0604243f84872a5dd39fc735ebcdb4fbe1b6bb5 (diff) | |
download | FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.zip FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.tar.gz |
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys.
Exceptions:
- sys/contrib not touched
- sys/mbuf.h edited manually
Diffstat (limited to 'sys/netipx')
-rw-r--r-- | sys/netipx/ipx_outputfl.c | 2 | ||||
-rw-r--r-- | sys/netipx/ipx_usrreq.c | 4 | ||||
-rw-r--r-- | sys/netipx/spx_reass.c | 2 | ||||
-rw-r--r-- | sys/netipx/spx_usrreq.c | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c index 3fbda88..25bbedf 100644 --- a/sys/netipx/ipx_outputfl.c +++ b/sys/netipx/ipx_outputfl.c @@ -270,7 +270,7 @@ ipx_output_type20(struct mbuf *m) if(ipx->ipx_sum != 0xffff) ipx->ipx_sum = ipx_cksum(m, ntohs(ipx->ipx_len)); - m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT); + m1 = m_copym(m, 0, M_COPYALL, M_NOWAIT); if(m1) { error = (*ifp->if_output)(ifp, m1, (struct sockaddr *)&dst, NULL); diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 5fcfa36..31b781c 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -257,7 +257,7 @@ ipx_output(struct ipxpcb *ipxp, struct mbuf *m0) (m->m_len + m->m_data < &m->m_dat[MLEN])) { mtod(m, char*)[m->m_len++] = 0; } else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA); if (m1 == NULL) { m_freem(m0); @@ -278,7 +278,7 @@ ipx_output(struct ipxpcb *ipxp, struct mbuf *m0) if (ipxp->ipxp_flags & IPXP_RAWOUT) { ipx = mtod(m, struct ipx *); } else { - M_PREPEND(m, sizeof(struct ipx), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ipx), M_NOWAIT); if (m == NULL) return (ENOBUFS); ipx = mtod(m, struct ipx *); diff --git a/sys/netipx/spx_reass.c b/sys/netipx/spx_reass.c index fea031f..2479ae1 100644 --- a/sys/netipx/spx_reass.c +++ b/sys/netipx/spx_reass.c @@ -399,7 +399,7 @@ present: spx_newchecks[4]++; if (dt != cb->s_rhdr.spx_dt) { struct mbuf *mm = - m_getclr(M_DONTWAIT, MT_CONTROL); + m_getclr(M_NOWAIT, MT_CONTROL); spx_newchecks[0]++; if (mm != NULL) { u_short *s = diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index 2b18288..9d00d10 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -473,7 +473,7 @@ spx_output(struct spxpcb *cb, struct mbuf *m0) cb->s_cc &= ~SPX_EM; while (len > mtu) { - m = m_copym(m0, 0, mtu, M_DONTWAIT); + m = m_copym(m0, 0, mtu, M_NOWAIT); if (m == NULL) { cb->s_cc |= oldEM; m_freem(m0); @@ -509,7 +509,7 @@ spx_output(struct spxpcb *cb, struct mbuf *m0) if (M_TRAILINGSPACE(m) >= 1) m->m_len++; else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA); if (m1 == NULL) { m_freem(m0); @@ -520,7 +520,7 @@ spx_output(struct spxpcb *cb, struct mbuf *m0) m->m_next = m1; } } - m = m_gethdr(M_DONTWAIT, MT_DATA); + m = m_gethdr(M_NOWAIT, MT_DATA); if (m == NULL) { m_freem(m0); return (ENOBUFS); @@ -734,7 +734,7 @@ send: spxstat.spxs_sndprobe++; if (cb->s_flags & SF_ACKNOW) spxstat.spxs_sndacks++; - m = m_gethdr(M_DONTWAIT, MT_DATA); + m = m_gethdr(M_NOWAIT, MT_DATA); if (m == NULL) return (ENOBUFS); @@ -1091,7 +1091,7 @@ spx_attach(struct socket *so, int proto, struct thread *td) cb = malloc(sizeof *cb, M_PCB, M_NOWAIT | M_ZERO); if (cb == NULL) return (ENOBUFS); - mm = m_getclr(M_DONTWAIT, MT_DATA); + mm = m_getclr(M_NOWAIT, MT_DATA); if (mm == NULL) { free(cb, M_PCB); return (ENOBUFS); |