summaryrefslogtreecommitdiffstats
path: root/sys/netkey/keysock.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netkey/keysock.c')
-rw-r--r--sys/netkey/keysock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 13394ac..dbc48a8 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_NOWAIT);
+ M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
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_NOWAIT, MT_DATA);
+ MGETHDR(n, M_DONTWAIT, MT_DATA);
n->m_len = MHLEN;
} else {
- MGET(n, M_NOWAIT, MT_DATA);
+ MGET(n, M_DONTWAIT, 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_NOWAIT);
+ MCLGET(n, M_DONTWAIT);
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, 0); /* XXX */
+ kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK); /* XXX */
if (kp == 0)
return ENOBUFS;
bzero(kp, sizeof *kp);
OpenPOWER on IntegriCloud