diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netns | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/netns')
-rw-r--r-- | sys/netns/idp_usrreq.c | 6 | ||||
-rw-r--r-- | sys/netns/ns.c | 2 | ||||
-rw-r--r-- | sys/netns/ns_error.c | 2 | ||||
-rw-r--r-- | sys/netns/ns_input.c | 2 | ||||
-rw-r--r-- | sys/netns/ns_ip.c | 6 | ||||
-rw-r--r-- | sys/netns/ns_pcb.c | 2 | ||||
-rw-r--r-- | sys/netns/spp_usrreq.c | 18 |
7 files changed, 19 insertions, 19 deletions
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c index 2642d1a..be9dd5c 100644 --- a/sys/netns/idp_usrreq.c +++ b/sys/netns/idp_usrreq.c @@ -160,7 +160,7 @@ idp_output(nsp, m0) (m->m_len + m->m_data < &m->m_dat[MLEN])) { m->m_len++; } else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA); if (m1 == 0) { m_freem(m0); @@ -181,7 +181,7 @@ idp_output(nsp, m0) if (nsp->nsp_flags & NSP_RAWOUT) { idp = mtod(m, struct idp *); } else { - M_PREPEND(m, sizeof (struct idp), M_DONTWAIT); + M_PREPEND(m, sizeof (struct idp), M_NOWAIT); if (m == 0) return (ENOBUFS); idp = mtod(m, struct idp *); @@ -273,7 +273,7 @@ idp_ctloutput(req, so, level, name, value) case PRCO_GETOPT: if (value==NULL) return (EINVAL); - m = m_get(M_DONTWAIT, MT_DATA); + m = m_get(M_NOWAIT, MT_DATA); if (m==NULL) return (ENOBUFS); switch (name) { diff --git a/sys/netns/ns.c b/sys/netns/ns.c index 7af5acf..40a8b0c 100644 --- a/sys/netns/ns.c +++ b/sys/netns/ns.c @@ -128,7 +128,7 @@ ns_control(so, cmd, data, ifp) case SIOCSIFDSTADDR: if (ia == (struct ns_ifaddr *)0) { oia = (struct ns_ifaddr *) - malloc(sizeof *ia, M_IFADDR, M_WAITOK); + malloc(sizeof *ia, M_IFADDR, 0); if (oia == (struct ns_ifaddr *)NULL) return (ENOBUFS); bzero((caddr_t)oia, sizeof(*oia)); diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c index fc4db94..769edf8 100644 --- a/sys/netns/ns_error.c +++ b/sys/netns/ns_error.c @@ -135,7 +135,7 @@ ns_error(om, type, param) /* * First, formulate ns_err message */ - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(M_NOWAIT, MT_HEADER); if (m == NULL) goto freeit; m->m_len = sizeof(*ep); diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c index 22abe02..033eae6 100644 --- a/sys/netns/ns_input.c +++ b/sys/netns/ns_input.c @@ -470,7 +470,7 @@ struct ifnet *ifp; if (m0) { register struct idp *idp; - M_PREPEND(m0, sizeof (*idp), M_DONTWAIT); + M_PREPEND(m0, sizeof (*idp), M_NOWAIT); if (m0 == NULL) continue; idp = mtod(m0, struct idp *); diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c index 55d1a9f..b566196 100644 --- a/sys/netns/ns_ip.c +++ b/sys/netns/ns_ip.c @@ -168,7 +168,7 @@ idpip_input(m, ifp) if (nsip_lastin) { m_freem(nsip_lastin); } - nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT); + nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_NOWAIT); } /* * Get IP and IDP header together in first mbuf. @@ -251,7 +251,7 @@ nsipoutput(ifn, m, dst) /* following clause not necessary on vax */ if (3 & (int)m->m_data) { /* force longword alignment of ip hdr */ - struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT); + struct mbuf *m0 = m_gethdr(MT_HEADER, M_NOWAIT); if (m0 == 0) { m_freem(m); return (ENOBUFS); @@ -263,7 +263,7 @@ nsipoutput(ifn, m, dst) m0->m_pkthdr.len = m0->m_len + m->m_len; m->m_flags &= ~M_PKTHDR; } else { - M_PREPEND(m, sizeof (struct ip), M_DONTWAIT); + M_PREPEND(m, sizeof (struct ip), M_NOWAIT); if (m == 0) return (ENOBUFS); } diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c index 01301c0..bcccc3a 100644 --- a/sys/netns/ns_pcb.c +++ b/sys/netns/ns_pcb.c @@ -58,7 +58,7 @@ ns_pcballoc(so, head) struct mbuf *m; register struct nspcb *nsp; - m = m_getclr(M_DONTWAIT, MT_PCB); + m = m_getclr(M_NOWAIT, MT_PCB); if (m == NULL) return (ENOBUFS); nsp = mtod(m, struct nspcb *); diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c index c942884..2191d1a 100644 --- a/sys/netns/spp_usrreq.c +++ b/sys/netns/spp_usrreq.c @@ -161,7 +161,7 @@ spp_input(m, nsp) spp_istat.gonawy++; goto dropwithreset; } - am = m_get(M_DONTWAIT, MT_SONAME); + am = m_get(M_NOWAIT, MT_SONAME); if (am == NULL) goto drop; am->m_len = sizeof (struct sockaddr_ns); @@ -528,7 +528,7 @@ present: spp_newchecks[4]++; if (dt != cb->s_rhdr.sp_dt) { struct mbuf *mm = - m_getclr(M_DONTWAIT, MT_CONTROL); + m_getclr(M_NOWAIT, MT_CONTROL); spp_newchecks[0]++; if (mm != NULL) { u_short *s = @@ -742,7 +742,7 @@ spp_output(cb, m0) * from usrreq(), so it is OK to * block. */ - m = m_copym(m0, 0, mtu, M_TRYWAIT); + m = m_copym(m0, 0, mtu, 0); if (cb->s_flags & SF_NEWCALL) { struct mbuf *mm = m; spp_newchecks[7]++; @@ -772,7 +772,7 @@ spp_output(cb, 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 == 0) { m_freem(m0); @@ -783,7 +783,7 @@ spp_output(cb, m0) m->m_next = m1; } } - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(M_NOWAIT, MT_HEADER); if (m == 0) { m_freem(m0); return (ENOBUFS); @@ -996,7 +996,7 @@ send: sppstat.spps_sndprobe++; if (cb->s_flags & SF_ACKNOW) sppstat.spps_sndacks++; - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(M_NOWAIT, MT_HEADER); if (m == 0) return (ENOBUFS); /* @@ -1156,7 +1156,7 @@ spp_ctloutput(req, so, level, name, value) case PRCO_GETOPT: if (value == NULL) return (EINVAL); - m = m_get(M_DONTWAIT, MT_DATA); + m = m_get(M_NOWAIT, MT_DATA); if (m == NULL) return (ENOBUFS); switch (name) { @@ -1296,7 +1296,7 @@ spp_usrreq(so, req, m, nam, controlp) } nsp = sotonspcb(so); - mm = m_getclr(M_DONTWAIT, MT_PCB); + mm = m_getclr(M_NOWAIT, MT_PCB); sb = &so->so_snd; if (mm == NULL) { @@ -1304,7 +1304,7 @@ spp_usrreq(so, req, m, nam, controlp) break; } cb = mtod(mm, struct sppcb *); - mm = m_getclr(M_DONTWAIT, MT_HEADER); + mm = m_getclr(M_NOWAIT, MT_HEADER); if (mm == NULL) { (void) m_free(dtom(m)); error = ENOBUFS; |