diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-06-18 08:23:49 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-06-18 08:23:49 +0000 |
| commit | 44a331fe2d808b09a35b5555e033f0c1a3cf5938 (patch) | |
| tree | 1b244f2d4c861aaededfd899ad53ef2ebf7aa97c /sys/netinet | |
| parent | 6186c23b5108f2d38eeef6eaf069f88cf605c8d7 (diff) | |
Use M_NOWAIT instead of M_DONTWAIT in MALLOC() (even though they're
defined to be the same in mbuf.h)
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_ah.c | 12 | ||||
| -rw-r--r-- | sys/netinet/ip_esp.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c index 5ff34fab0d6..6e1a2481820 100644 --- a/sys/netinet/ip_ah.c +++ b/sys/netinet/ip_ah.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah.c,v 1.40 2000/06/18 03:07:25 angelos Exp $ */ +/* $OpenBSD: ip_ah.c,v 1.41 2000/06/18 08:23:46 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -345,7 +345,7 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out) if (m->m_len <= skip) { MALLOC(ptr, unsigned char *, skip - sizeof(struct ip6_hdr), - M_XDATA, M_DONTWAIT); + M_XDATA, M_NOWAIT); if (ptr == NULL) { DPRINTF(("ah_massage_headers(): failed to allocate memory for IPv6 headers\n")); @@ -576,7 +576,7 @@ ah_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff) /* Allocate IPsec-specific opaque crypto info */ MALLOC(tc, struct tdb_crypto *, sizeof(struct tdb_crypto), - M_XDATA, M_DONTWAIT); + M_XDATA, M_NOWAIT); if (tc == NULL) { m_freem(m); @@ -591,7 +591,7 @@ ah_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff) * AH header. */ MALLOC(tc->tc_ptr, caddr_t, skip + rplen + ahx->authsize, - M_XDATA, M_DONTWAIT); + M_XDATA, M_NOWAIT); if (tc->tc_ptr == 0) { m_freem(m); @@ -1019,7 +1019,7 @@ ah_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, /* Allocate IPsec-specific opaque crypto info */ MALLOC(tc, struct tdb_crypto *, sizeof(struct tdb_crypto), M_XDATA, - M_DONTWAIT); + M_NOWAIT); if (tc == NULL) { m_freem(m); @@ -1030,7 +1030,7 @@ ah_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, } /* Save the skipped portion of the packet */ - MALLOC(tc->tc_ptr, caddr_t, skip, M_XDATA, M_DONTWAIT); + MALLOC(tc->tc_ptr, caddr_t, skip, M_XDATA, M_NOWAIT); if (tc->tc_ptr == 0) { FREE(tc, M_XDATA); diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index eea264cdddc..818255f7b02 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.47 2000/06/18 03:07:25 angelos Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.48 2000/06/18 08:23:48 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -380,7 +380,7 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff) /* Get IPsec-specific opaque pointer */ MALLOC(tc, struct tdb_crypto *, sizeof(struct tdb_crypto), - M_XDATA, M_DONTWAIT); + M_XDATA, M_NOWAIT); if (tc == NULL) { m_freem(m); @@ -405,7 +405,7 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff) crda->crd_klen = tdb->tdb_amxkeylen * 8; /* Keep a copy of the authenticator */ - MALLOC(tc->tc_ptr, caddr_t, alen, M_XDATA, M_DONTWAIT); + MALLOC(tc->tc_ptr, caddr_t, alen, M_XDATA, M_NOWAIT); if (tc->tc_ptr == 0) { FREE(tc, M_XDATA); @@ -947,7 +947,7 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, /* IPsec-specific opaque crypto info */ MALLOC(tc, struct tdb_crypto *, sizeof(struct tdb_crypto), - M_XDATA, M_DONTWAIT); + M_XDATA, M_NOWAIT); if (tc == NULL) { m_freem(m); |