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/netkey/keysock.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/netkey/keysock.c')
| -rw-r--r-- | sys/netkey/keysock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c index dbc48a85e111..13394ac24b06 100644 --- a/sys/netkey/keysock.c +++ b/sys/netkey/keysock.c @@ -148,7 +148,7 @@ key_sendup0(rp, m, promisc) if (promisc) { struct sadb_msg *pmsg; - M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT); + M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT); if (m && m->m_len < sizeof(struct sadb_msg)) m = m_pullup(m, sizeof(struct sadb_msg)); if (!m) { @@ -219,10 +219,10 @@ key_sendup(so, msg, len, target) m = mprev = NULL; while (tlen > 0) { if (tlen == len) { - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, M_NOWAIT, MT_DATA); n->m_len = MHLEN; } else { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, M_NOWAIT, MT_DATA); n->m_len = MLEN; } if (!n) { @@ -230,7 +230,7 @@ key_sendup(so, msg, len, target) return ENOBUFS; } if (tlen >= MCLBYTES) { /*XXX better threshold? */ - MCLGET(n, M_DONTWAIT); + MCLGET(n, M_NOWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); m_freem(m); @@ -398,7 +398,7 @@ key_attach(struct socket *so, int proto, struct thread *td) if (sotorawcb(so) != 0) return EISCONN; /* XXX panic? */ - kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK); /* XXX */ + kp = (struct keycb *)malloc(sizeof *kp, M_PCB, 0); /* XXX */ if (kp == 0) return ENOBUFS; bzero(kp, sizeof *kp); |