From 062eab50c7d1a4f38c8e29413ab10a0332b37f97 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 22 Apr 2004 05:09:51 +0000
Subject: [PATCH] More M_NOWAIT -> M_INTWAIT | M_NULLOK conversions, primarily
 atm and ipsec. NOTE: the atm code uses malloc(M_DEVBUF, ..).  It should
 probably have its own malloc domain.

---
 sys/netproto/atm/atm_device.c       |  9 +++++----
 sys/netproto/atm/atm_subr.c         |  6 +++---
 sys/netproto/atm/sigpvc/sigpvc_if.c |  5 ++---
 sys/netproto/atm/spans/spans_if.c   | 10 +++++-----
 sys/netproto/atm/uni/uniarp.c       |  5 +++--
 sys/netproto/atm/uni/unisig_if.c    |  5 ++---
 sys/netproto/ipsec/ipsec.c          | 11 +++++------
 sys/netproto/ipsec/key.c            | 19 ++++++++++---------
 sys/netproto/ipsec/xform_ah.c       | 20 ++++++++++----------
 sys/netproto/ipsec/xform_esp.c      | 14 +++++++-------
 sys/netproto/ipsec/xform_ipcomp.c   |  9 +++++----
 sys/netproto/ipx/ipx_ip.c           |  6 ++----
 sys/netproto/ipx/ipx_pcb.c          |  5 +++--
 sys/netproto/ipx/spx_usrreq.c       |  9 ++-------
 sys/netproto/key/key.c              |  6 +++---
 sys/netproto/key/keydb.c            | 16 +++++++---------
 sys/netproto/ns/ns_ip.c             |  5 ++---
 17 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/sys/netproto/atm/atm_device.c b/sys/netproto/atm/atm_device.c
index d7ed08d06f..ad2ff8ce4b 100644
--- a/sys/netproto/atm/atm_device.c
+++ b/sys/netproto/atm/atm_device.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/atm_device.c,v 1.5 1999/08/28 00:48:35 peter Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/atm_device.c,v 1.4 2003/08/07 21:17:34 dillon Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/atm_device.c,v 1.5 2004/04/22 05:09:43 dillon Exp $
  */
 
 /*
@@ -426,7 +426,8 @@ atm_dev_alloc(size, align, flags)
 	 * and link it into the chain
 	 */
 	if (mep == NULL) {
-		mbp = (Mem_blk *) KM_ALLOC(sizeof(Mem_blk), M_DEVBUF, M_NOWAIT);
+		mbp = KM_ALLOC(sizeof(Mem_blk), M_DEVBUF, 
+				M_INTWAIT | M_NULLOK);
 		if (mbp == NULL) {
 			log(LOG_ERR, "atm_dev_alloc: Mem_blk failure\n");
 			(void) splx(s);
@@ -474,12 +475,12 @@ atm_dev_alloc(size, align, flags)
 #ifdef sun
 		mep->me_kaddr = IOPBALLOC(ksize);
 #elif defined(__i386__)
-		mep->me_kaddr = KM_ALLOC(ksize, M_DEVBUF, M_NOWAIT);
+		mep->me_kaddr = KM_ALLOC(ksize, M_DEVBUF, M_INTWAIT | M_NULLOK);
 #else
 		#error Unsupported/unconfigured OS
 #endif
 	} else {
-		mep->me_kaddr = KM_ALLOC(ksize, M_DEVBUF, M_NOWAIT);
+		mep->me_kaddr = KM_ALLOC(ksize, M_DEVBUF, M_INTWAIT | M_NULLOK);
 	}
 
 	if (mep->me_kaddr == NULL) {
diff --git a/sys/netproto/atm/atm_subr.c b/sys/netproto/atm/atm_subr.c
index e608c13c6b..d2b2f34735 100644
--- a/sys/netproto/atm/atm_subr.c
+++ b/sys/netproto/atm/atm_subr.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/atm_subr.c,v 1.7 2000/02/13 03:31:59 peter Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/atm_subr.c,v 1.13 2004/04/21 18:14:00 dillon Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/atm_subr.c,v 1.14 2004/04/22 05:09:43 dillon Exp $
  */
 
 /*
@@ -222,8 +222,8 @@ atm_allocate(sip)
 			return (NULL);
 		}
 
-		scp = (struct sp_chunk *)
-			KM_ALLOC(sip->si_chunksiz, M_DEVBUF, M_NOWAIT);
+		scp = KM_ALLOC(sip->si_chunksiz, M_DEVBUF,
+				M_INTWAIT | M_NULLOK);
 		if (scp == NULL) {
 			sip->si_fails++;
 			(void) splx(s);
diff --git a/sys/netproto/atm/sigpvc/sigpvc_if.c b/sys/netproto/atm/sigpvc/sigpvc_if.c
index 8314d20059..b75f9ebc55 100644
--- a/sys/netproto/atm/sigpvc/sigpvc_if.c
+++ b/sys/netproto/atm/sigpvc/sigpvc_if.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.7 2000/01/17 20:49:46 mks Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_if.c,v 1.6 2004/02/06 09:17:41 rob Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_if.c,v 1.7 2004/04/22 05:09:44 dillon Exp $
  */
 
 /*
@@ -222,8 +222,7 @@ sigpvc_attach(smp, pip)
 	/*
 	 * Allocate sigpvc protocol instance control block
 	 */
-	pvp = (struct sigpvc *)
-		KM_ALLOC(sizeof(struct sigpvc), M_DEVBUF, M_NOWAIT);
+	pvp = KM_ALLOC(sizeof(struct sigpvc), M_DEVBUF, M_INTWAIT | M_NULLOK);
 	if (pvp == NULL) {
 		err = ENOMEM;
 		goto done;
diff --git a/sys/netproto/atm/spans/spans_if.c b/sys/netproto/atm/spans/spans_if.c
index c8ee2e8f35..77f802a667 100644
--- a/sys/netproto/atm/spans/spans_if.c
+++ b/sys/netproto/atm/spans/spans_if.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.6 1999/08/28 00:48:49 peter Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/spans/spans_if.c,v 1.6 2004/02/06 09:17:41 rob Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/spans/spans_if.c,v 1.7 2004/04/22 05:09:45 dillon Exp $
  */
 
 /*
@@ -116,8 +116,8 @@ spans_start()
 	/*
 	 * Allocate protocol definition structure
 	 */
-	spans_mgr = (struct sigmgr *)KM_ALLOC(sizeof(struct sigmgr),
-			M_DEVBUF, M_NOWAIT);
+	spans_mgr = KM_ALLOC(sizeof(struct sigmgr),
+			M_DEVBUF, M_INTWAIT | M_NULLOK);
 	if (spans_mgr == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -271,8 +271,8 @@ spans_attach(smp, pip)
 	/*
 	 * Allocate SPANS protocol instance control block
 	 */
-	spp = (struct spans *)KM_ALLOC(sizeof(struct spans),
-			M_DEVBUF, M_NOWAIT);
+	spp = KM_ALLOC(sizeof(struct spans),
+			M_DEVBUF, M_INTWAIT | M_NULLOK);
 	if (spp == NULL) {
 		err = ENOMEM;
 		goto done;
diff --git a/sys/netproto/atm/uni/uniarp.c b/sys/netproto/atm/uni/uniarp.c
index 4518d74559..7cae6be905 100644
--- a/sys/netproto/atm/uni/uniarp.c
+++ b/sys/netproto/atm/uni/uniarp.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.8 2000/01/15 20:46:07 mks Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/uni/uniarp.c,v 1.6 2004/01/06 03:17:28 dillon Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/uni/uniarp.c,v 1.7 2004/04/22 05:09:46 dillon Exp $
  */
 
 /*
@@ -936,7 +936,8 @@ uniarp_ioctl(code, data, arg1)
 				break;
 			}
 			buf_len = i * sizeof(struct uniarp_prf);
-			buf_addr = KM_ALLOC(buf_len, M_DEVBUF, M_NOWAIT);
+			buf_addr = KM_ALLOC(buf_len, M_DEVBUF, 
+						M_INTWAIT | M_NULLOK);
 			if (buf_addr == NULL) {
 				err = ENOMEM;
 				break;
diff --git a/sys/netproto/atm/uni/unisig_if.c b/sys/netproto/atm/uni/unisig_if.c
index 4e484b0642..d13aae5bc5 100644
--- a/sys/netproto/atm/uni/unisig_if.c
+++ b/sys/netproto/atm/uni/unisig_if.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.8 2000/01/17 20:49:56 mks Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/uni/unisig_if.c,v 1.5 2003/08/23 10:06:22 rob Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/uni/unisig_if.c,v 1.6 2004/04/22 05:09:46 dillon Exp $
  */
 
 /*
@@ -247,8 +247,7 @@ unisig_attach(smp, pip)
 	/*
 	 * Allocate UNISIG protocol instance control block
 	 */
-	usp = (struct unisig *)
-			KM_ALLOC(sizeof(struct unisig), M_DEVBUF, M_NOWAIT);
+	usp = KM_ALLOC(sizeof(struct unisig), M_DEVBUF, M_INTWAIT | M_NULLOK);
 	if (usp == NULL) {
 		err = ENOMEM;
 		goto done;
diff --git a/sys/netproto/ipsec/ipsec.c b/sys/netproto/ipsec/ipsec.c
index da69c0b0c3..1a2d6728f9 100644
--- a/sys/netproto/ipsec/ipsec.c
+++ b/sys/netproto/ipsec/ipsec.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/ipsec.c,v 1.2.2.1 2003/01/24 05:11:35 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/ipsec.c,v 1.5 2004/02/14 21:15:33 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/ipsec.c,v 1.6 2004/04/22 05:09:48 dillon Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
 /*
@@ -861,8 +861,8 @@ ipsec_init_policy(so, pcb_sp)
 	if (so == NULL || pcb_sp == NULL)
 		panic("ipsec_init_policy: NULL pointer was passed.\n");
 
-	new = (struct inpcbpolicy *) malloc(sizeof(struct inpcbpolicy),
-					    M_SECA, M_NOWAIT|M_ZERO);
+	new = malloc(sizeof(struct inpcbpolicy),
+			M_SECA, M_INTWAIT | M_ZERO | M_NULLOK);
 	if (new == NULL) {
 		ipseclog((LOG_DEBUG, "ipsec_init_policy: No more memory.\n"));
 		return ENOBUFS;
@@ -942,11 +942,10 @@ ipsec_deepcopy_policy(src)
 	 */
 	q = &newchain;
 	for (p = src->req; p; p = p->next) {
-		*q = (struct ipsecrequest *)malloc(sizeof(struct ipsecrequest),
-			M_SECA, M_NOWAIT);
+		*q = malloc(sizeof(struct ipsecrequest),
+			M_SECA, M_INTWAIT | M_ZERO | M_NULLOK);
 		if (*q == NULL)
 			goto fail;
-		bzero(*q, sizeof(**q));
 		(*q)->next = NULL;
 
 		(*q)->saidx.proto = p->saidx.proto;
diff --git a/sys/netproto/ipsec/key.c b/sys/netproto/ipsec/key.c
index 16b206ae2a..10b61e938b 100644
--- a/sys/netproto/ipsec/key.c
+++ b/sys/netproto/ipsec/key.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/key.c,v 1.5 2003/11/09 02:22:36 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/key.c,v 1.6 2004/04/22 05:09:48 dillon Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*
@@ -291,13 +291,13 @@ MALLOC_DEFINE(M_SECA, "key mgmt", "security associations, key management");
 
 #if 1
 #define KMALLOC(p, t, n)                                                     \
-	((p) = (t) malloc((unsigned long)(n), M_SECA, M_NOWAIT))
+	((p) = (t) malloc((unsigned long)(n), M_SECA, M_INTWAIT | M_NULLOK))
 #define KFREE(p)                                                             \
 	free((caddr_t)(p), M_SECA)
 #else
 #define KMALLOC(p, t, n) \
 do { \
-	((p) = (t)malloc((unsigned long)(n), M_SECA, M_NOWAIT));             \
+	((p) = (t)malloc((unsigned long)(n), M_SECA, M_INTWAIT | M_NULLOK)); \
 	printf("%s %d: %p <- KMALLOC(%s, %d)\n",                             \
 		__FILE__, __LINE__, (p), #t, n);                             \
 } while (0)
@@ -1268,8 +1268,8 @@ key_newsp(const char* where, int tag)
 {
 	struct secpolicy *newsp = NULL;
 
-	newsp = (struct secpolicy *)
-		malloc(sizeof(struct secpolicy), M_SECA, M_NOWAIT|M_ZERO);
+	newsp = malloc(sizeof(struct secpolicy), M_SECA,
+			M_INTWAIT | M_ZERO | M_NULLOK);
 	if (newsp) {
 		newsp->refcnt = 1;
 		newsp->req = NULL;
@@ -2554,8 +2554,8 @@ key_newsah(saidx)
 
 	KASSERT(saidx != NULL, ("key_newsaidx: null saidx"));
 
-	newsah = (struct secashead *)
-		malloc(sizeof(struct secashead), M_SECA, M_NOWAIT|M_ZERO);
+	newsah = malloc(sizeof(struct secashead), M_SECA, 
+			M_INTWAIT | M_ZERO | M_NULLOK);
 	if (newsah != NULL) {
 		int i;
 		for (i = 0; i < sizeof(newsah->savtree)/sizeof(newsah->savtree[0]); i++)
@@ -2926,8 +2926,9 @@ key_setsaval(sav, m, mhp)
 
 		/* replay window */
 		if ((sa0->sadb_sa_flags & SADB_X_EXT_OLD) == 0) {
-			sav->replay = (struct secreplay *)
-				malloc(sizeof(struct secreplay)+sa0->sadb_sa_replay, M_SECA, M_NOWAIT|M_ZERO);
+			sav->replay = 
+			    malloc(sizeof(struct secreplay)+sa0->sadb_sa_replay,
+				    M_SECA, M_INTWAIT | M_ZERO | M_NULLOK);
 			if (sav->replay == NULL) {
 				ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
 				error = ENOBUFS;
diff --git a/sys/netproto/ipsec/xform_ah.c b/sys/netproto/ipsec/xform_ah.c
index 1159d8e0ea..74dc18895d 100644
--- a/sys/netproto/ipsec/xform_ah.c
+++ b/sys/netproto/ipsec/xform_ah.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.2 2003/02/26 00:14:05 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/xform_ah.c,v 1.3 2003/08/07 21:17:37 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/xform_ah.c,v 1.4 2004/04/22 05:09:48 dillon Exp $	*/
 /*	$OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -430,9 +430,8 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out)
 		/* Let's deal with the remaining headers (if any). */
 		if (skip - sizeof(struct ip6_hdr) > 0) {
 			if (m->m_len <= skip) {
-				ptr = (unsigned char *) malloc(
-				    skip - sizeof(struct ip6_hdr),
-				    M_XDATA, M_NOWAIT);
+				ptr = malloc(skip - sizeof(struct ip6_hdr),
+					    M_XDATA, M_INTWAIT | M_NULLOK);
 				if (ptr == NULL) {
 					DPRINTF(("ah_massage_headers: failed "
 					    "to allocate memory for IPv6 "
@@ -644,12 +643,13 @@ ah_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
 
 	/* Allocate IPsec-specific opaque crypto info. */
 	if (mtag == NULL) {
-		tc = (struct tdb_crypto *) malloc(sizeof (struct tdb_crypto) +
-			skip + rplen + authsize, M_XDATA, M_NOWAIT|M_ZERO);
+		tc = malloc(sizeof (struct tdb_crypto) +
+			skip + rplen + authsize, M_XDATA, 
+			M_INTWAIT | M_ZERO | M_NULLOK);
 	} else {
 		/* Hash verification has already been done successfully. */
-		tc = (struct tdb_crypto *) malloc(sizeof (struct tdb_crypto),
-						    M_XDATA, M_NOWAIT|M_ZERO);
+		tc = malloc(sizeof (struct tdb_crypto),
+			M_XDATA, M_INTWAIT | M_ZERO | M_NULLOK);
 	}
 	if (tc == NULL) {
 		DPRINTF(("ah_input: failed to allocate tdb_crypto\n"));
@@ -1026,8 +1026,8 @@ ah_output(
 	crda->crd_klen = _KEYBITS(sav->key_auth);
 
 	/* Allocate IPsec-specific opaque crypto info. */
-	tc = (struct tdb_crypto *) malloc(
-		sizeof(struct tdb_crypto) + skip, M_XDATA, M_NOWAIT|M_ZERO);
+	tc = malloc(sizeof(struct tdb_crypto) + skip, M_XDATA,
+		M_INTWAIT | M_ZERO | M_NULLOK);
 	if (tc == NULL) {
 		crypto_freereq(crp);
 		DPRINTF(("ah_output: failed to allocate tdb_crypto\n"));
diff --git a/sys/netproto/ipsec/xform_esp.c b/sys/netproto/ipsec/xform_esp.c
index de05842282..8dc97a2d41 100644
--- a/sys/netproto/ipsec/xform_esp.c
+++ b/sys/netproto/ipsec/xform_esp.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.2 2003/02/26 00:14:05 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/xform_esp.c,v 1.3 2003/08/07 21:17:37 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/xform_esp.c,v 1.4 2004/04/22 05:09:48 dillon Exp $	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -352,11 +352,11 @@ esp_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
 
 	/* Get IPsec-specific opaque pointer */
 	if (esph == NULL || mtag != NULL)
-		tc = (struct tdb_crypto *) malloc(sizeof(struct tdb_crypto),
-		    M_XDATA, M_NOWAIT|M_ZERO);
+		tc = malloc(sizeof(struct tdb_crypto),
+			    M_XDATA, M_INTWAIT | M_ZERO | M_NULLOK);
 	else
-		tc = (struct tdb_crypto *) malloc(sizeof(struct tdb_crypto) + alen,
-		    M_XDATA, M_NOWAIT|M_ZERO);
+		tc = malloc(sizeof(struct tdb_crypto) + alen,
+			    M_XDATA, M_INTWAIT | M_ZERO | M_NULLOK);
 	if (tc == NULL) {
 		crypto_freereq(crp);
 		DPRINTF(("esp_input: failed to allocate tdb_crypto\n"));
@@ -812,8 +812,8 @@ esp_output(
 		crda = crp->crp_desc;
 
 	/* IPsec-specific opaque crypto info. */
-	tc = (struct tdb_crypto *) malloc(sizeof(struct tdb_crypto),
-		M_XDATA, M_NOWAIT|M_ZERO);
+	tc = malloc(sizeof(struct tdb_crypto),
+			M_XDATA, M_INTWAIT | M_ZERO | M_NULLOK);
 	if (tc == NULL) {
 		crypto_freereq(crp);
 		DPRINTF(("esp_output: failed to allocate tdb_crypto\n"));
diff --git a/sys/netproto/ipsec/xform_ipcomp.c b/sys/netproto/ipsec/xform_ipcomp.c
index f0d1af2a42..7263229e57 100644
--- a/sys/netproto/ipsec/xform_ipcomp.c
+++ b/sys/netproto/ipsec/xform_ipcomp.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.2 2003/02/26 00:14:06 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/xform_ipcomp.c,v 1.3 2003/08/07 21:17:37 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/xform_ipcomp.c,v 1.4 2004/04/22 05:09:48 dillon Exp $	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
 /*
@@ -151,7 +151,8 @@ ipcomp_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
 		return ENOBUFS;
 	}
 	/* Get IPsec-specific opaque pointer */
-	tc = (struct tdb_crypto *) malloc(sizeof (*tc), M_XDATA, M_NOWAIT|M_ZERO);
+	tc = malloc(sizeof (*tc), M_XDATA, 
+		    M_INTWAIT | M_ZERO | M_NULLOK);
 	if (tc == NULL) {
 		m_freem(m);
 		crypto_freereq(crp);
@@ -456,8 +457,8 @@ ipcomp_output(
 	crdc->crd_alg = ipcompx->type;
 
 	/* IPsec-specific opaque crypto info */
-	tc = (struct tdb_crypto *) malloc(sizeof(struct tdb_crypto),
-		M_XDATA, M_NOWAIT|M_ZERO);
+	tc = malloc(sizeof(struct tdb_crypto),
+		    M_XDATA, M_INTWAIT | M_ZERO | M_NULLOK);
 	if (tc == NULL) {
 		ipcompstat.ipcomps_crypto++;
 		DPRINTF(("ipcomp_output: failed to allocate tdb_crypto\n"));
diff --git a/sys/netproto/ipx/ipx_ip.c b/sys/netproto/ipx/ipx_ip.c
index bbd64fe35a..9039c9c56c 100644
--- a/sys/netproto/ipx/ipx_ip.c
+++ b/sys/netproto/ipx/ipx_ip.c
@@ -34,7 +34,7 @@
  *	@(#)ipx_ip.c
  *
  * $FreeBSD: src/sys/netipx/ipx_ip.c,v 1.24.2.2 2003/01/23 21:06:48 sam Exp $
- * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.10 2004/04/01 07:27:17 joerg Exp $
+ * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.11 2004/04/22 05:09:49 dillon Exp $
  */
 
 /*
@@ -104,9 +104,7 @@ ipxipattach()
 		ifp->if_flags = IFF_POINTOPOINT;
 	}
 
-	MALLOC((m), struct ifnet_en *, sizeof(*m), M_PCB, M_NOWAIT | M_ZERO);
-	if (m == NULL)
-		return (NULL);
+	MALLOC((m), struct ifnet_en *, sizeof(*m), M_PCB, M_WAITOK | M_ZERO);
 	m->ifen_next = ipxip_list;
 	ipxip_list = m;
 	ifp = &m->ifen_ifnet;
diff --git a/sys/netproto/ipx/ipx_pcb.c b/sys/netproto/ipx/ipx_pcb.c
index a1022ff26f..ac0a715b98 100644
--- a/sys/netproto/ipx/ipx_pcb.c
+++ b/sys/netproto/ipx/ipx_pcb.c
@@ -34,7 +34,7 @@
  *	@(#)ipx_pcb.c
  *
  * $FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.18.2.1 2001/02/22 09:44:18 bp Exp $
- * $DragonFly: src/sys/netproto/ipx/ipx_pcb.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
+ * $DragonFly: src/sys/netproto/ipx/ipx_pcb.c,v 1.8 2004/04/22 05:09:49 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,8 @@ ipx_pcballoc(struct socket *so, struct ipxpcb *head)
 {
 	struct ipxpcb *ipxp;
 
-	MALLOC(ipxp, struct ipxpcb *, sizeof *ipxp, M_PCB, M_NOWAIT | M_ZERO);
+	MALLOC(ipxp, struct ipxpcb *, sizeof *ipxp, M_PCB, 
+		M_WAITOK | M_ZERO | M_NULLOK);
 	if (ipxp == NULL)
 		return (ENOBUFS);
 	ipxp->ipxp_socket = so;
diff --git a/sys/netproto/ipx/spx_usrreq.c b/sys/netproto/ipx/spx_usrreq.c
index 1d124031f6..c1bb61f4ec 100644
--- a/sys/netproto/ipx/spx_usrreq.c
+++ b/sys/netproto/ipx/spx_usrreq.c
@@ -34,7 +34,7 @@
  *	@(#)spx_usrreq.h
  *
  * $FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.27.2.1 2001/02/22 09:44:18 bp Exp $
- * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
+ * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.8 2004/04/22 05:09:49 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -1332,12 +1332,7 @@ spx_attach(struct socket *so, int proto, struct pru_attach_info *ai)
 	}
 	ipxp = sotoipxpcb(so);
 
-	MALLOC(cb, struct spxpcb *, sizeof *cb, M_PCB, M_NOWAIT | M_ZERO);
-
-	if (cb == NULL) {
-		error = ENOBUFS;
-		goto spx_attach_end;
-	}
+	MALLOC(cb, struct spxpcb *, sizeof *cb, M_PCB, M_INTWAIT | M_ZERO);
 	sb = &so->so_snd;
 
 	mm = m_getclr(M_DONTWAIT, MT_HEADER);
diff --git a/sys/netproto/key/key.c b/sys/netproto/key/key.c
index a3d5ffbddf..a8af6ecd56 100644
--- a/sys/netproto/key/key.c
+++ b/sys/netproto/key/key.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netkey/key.c,v 1.16.2.13 2002/07/24 18:17:40 ume Exp $	*/
-/*	$DragonFly: src/sys/netproto/key/key.c,v 1.5 2003/11/09 02:22:37 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/key/key.c,v 1.6 2004/04/22 05:09:50 dillon Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*
@@ -305,13 +305,13 @@ do { \
 
 #if 1
 #define KMALLOC(p, t, n)                                                     \
-	((p) = (t) malloc((unsigned long)(n), M_SECA, M_NOWAIT))
+	((p) = (t) malloc((unsigned long)(n), M_SECA, M_INTWAIT | M_NULLOK))
 #define KFREE(p)                                                             \
 	free((caddr_t)(p), M_SECA);
 #else
 #define KMALLOC(p, t, n) \
 do { \
-	((p) = (t)malloc((unsigned long)(n), M_SECA, M_NOWAIT));             \
+	((p) = (t)malloc((unsigned long)(n), M_SECA, M_INTWAIT | M_NULLOK)); \
 	printf("%s %d: %p <- KMALLOC(%s, %d)\n",                             \
 		__FILE__, __LINE__, (p), #t, n);                             \
 } while (0)
diff --git a/sys/netproto/key/keydb.c b/sys/netproto/key/keydb.c
index a13b0ff9eb..b6b326f967 100644
--- a/sys/netproto/key/keydb.c
+++ b/sys/netproto/key/keydb.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netkey/keydb.c,v 1.1.2.1 2000/07/15 07:14:42 kris Exp $	*/
-/*	$DragonFly: src/sys/netproto/key/keydb.c,v 1.5 2003/08/23 10:06:24 rob Exp $	*/
+/*	$DragonFly: src/sys/netproto/key/keydb.c,v 1.6 2004/04/22 05:09:50 dillon Exp $	*/
 /*	$KAME: keydb.c,v 1.64 2000/05/11 17:02:30 itojun Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ keydb_newsecpolicy()
 {
 	struct secpolicy *p;
 
-	p = (struct secpolicy *)malloc(sizeof(*p), M_SECA, M_NOWAIT);
+	p = malloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK);
 	if (!p)
 		return p;
 	bzero(p, sizeof(*p));
@@ -91,7 +91,7 @@ keydb_newsecashead()
 	struct secashead *p;
 	int i;
 
-	p = (struct secashead *)malloc(sizeof(*p), M_SECA, M_NOWAIT);
+	p = malloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK);
 	if (!p)
 		return p;
 	bzero(p, sizeof(*p));
@@ -116,7 +116,7 @@ keydb_newsecasvar()
 {
 	struct secasvar *p;
 
-	p = (struct secasvar *)malloc(sizeof(*p), M_SECA, M_NOWAIT);
+	p = malloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK);
 	if (!p)
 		return p;
 	bzero(p, sizeof(*p));
@@ -169,13 +169,13 @@ keydb_newsecreplay(wsize)
 {
 	struct secreplay *p;
 
-	p = (struct secreplay *)malloc(sizeof(*p), M_SECA, M_NOWAIT);
+	p = malloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK);
 	if (!p)
 		return p;
 
 	bzero(p, sizeof(*p));
 	if (wsize != 0) {
-		p->bitmap = (caddr_t)malloc(wsize, M_SECA, M_NOWAIT);
+		p->bitmap = (caddr_t)malloc(wsize, M_SECA, M_INTWAIT | M_NULLOK);
 		if (!p->bitmap) {
 			free(p, M_SECA);
 			return NULL;
@@ -204,9 +204,7 @@ keydb_newsecreg()
 {
 	struct secreg *p;
 
-	p = (struct secreg *)malloc(sizeof(*p), M_SECA, M_NOWAIT);
-	if (p)
-		bzero(p, sizeof(*p));
+	p = malloc(sizeof(*p), M_SECA, M_INTWAIT | M_ZERO | M_NULLOK);
 	return p;
 }
 
diff --git a/sys/netproto/ns/ns_ip.c b/sys/netproto/ns/ns_ip.c
index e215326245..c729dc4ddc 100644
--- a/sys/netproto/ns/ns_ip.c
+++ b/sys/netproto/ns/ns_ip.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/ns_ip.c,v 1.9 1999/08/28 00:49:50 peter Exp $
- * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.7 2004/03/06 07:30:44 hsu Exp $
+ * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.8 2004/04/22 05:09:51 dillon Exp $
  */
 
 /*
@@ -98,8 +98,7 @@ nsipattach()
 		ifp->if_flags = IFF_POINTOPOINT;
 	}
 
-	MALLOC((m), struct ifnet_en *, sizeof(*m), M_PCB, M_NOWAIT);
-	if (m == NULL) return (NULL);
+	MALLOC((m), struct ifnet_en *, sizeof(*m), M_PCB, M_WAITOK);
 	m->ifen_next = nsip_list;
 	nsip_list = m;
 	ifp = &m->ifen_ifnet;
-- 
2.41.0