diff options
author | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | 44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netns/ns_ip.c | |
parent | 1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff) |
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/netns/ns_ip.c')
-rw-r--r-- | sys/netns/ns_ip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c index 55d1a9f88b3c..b566196b1704 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); } |