aboutsummaryrefslogtreecommitdiff
path: root/sys/net/ppp_tty.c
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
commit44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch)
treef16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/net/ppp_tty.c
parent1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff)
downloadsrc-44956c9863dc03344b03bdf6a83acf4e743f8e50.tar.gz
src-44956c9863dc03344b03bdf6a83acf4e743f8e50.zip
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Notes
Notes: svn path=/head/; revision=109623
Diffstat (limited to 'sys/net/ppp_tty.c')
-rw-r--r--sys/net/ppp_tty.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index ce05012e95d0..92215f1bd3dd 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -397,7 +397,7 @@ pppwrite(tp, uio, flag)
s = spltty();
for (mp = &m0; uio->uio_resid; mp = &m->m_next) {
- MGET(m, M_TRYWAIT, MT_DATA);
+ MGET(m, 0, MT_DATA);
if ((*mp = m) == NULL) {
m_freem(m0);
splx(s);
@@ -405,7 +405,7 @@ pppwrite(tp, uio, flag)
}
m->m_len = 0;
if (uio->uio_resid >= MCLBYTES / 2)
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
len = M_TRAILINGSPACE(m);
if (len > uio->uio_resid)
len = uio->uio_resid;
@@ -809,11 +809,11 @@ pppgetm(sc)
mp = &sc->sc_m;
for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
if ((m = *mp) == NULL) {
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
break;
*mp = m;
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
}
len -= M_DATASIZE(m);
mp = &m->m_next;