diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/netipsec/keysock.c | |
| parent | 8f3e32c2b6b9f392e096f096653596f55f2134ae (diff) | |
| download | src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.tar.gz src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.zip | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Notes
Notes:
svn path=/head/; revision=111119
Diffstat (limited to 'sys/netipsec/keysock.c')
| -rw-r--r-- | sys/netipsec/keysock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 7ae835a21d8b..d61c15b4ba1a 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -152,7 +152,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) { @@ -223,10 +223,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) { @@ -234,7 +234,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); @@ -402,7 +402,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_ZERO); /* XXX */ + kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK|M_ZERO); /* XXX */ if (kp == 0) return ENOBUFS; |