| From: | Craig Dooley <craig@xxxxxxxxxx> |
| Date: | Tue, 9 Mar 2004 09:02:06 -0500 |
This changes any other calls to malloc with M_DONTWAIT to M_NOWAIT. -Craig -- ------------------------------------------------------------------------ Craig Dooley craig@xxxxxxxxxx ------------------------------------------------------------------------
Index: net/bpf.c
===================================================================
RCS file: /home/dcvs/src/sys/net/bpf.c,v
retrieving revision 1.12
diff -u -r1.12 bpf.c
--- net/bpf.c 24 Feb 2004 18:41:57 -0000 1.12
+++ net/bpf.c 9 Mar 2004 13:47:23 -0000
@@ -1323,7 +1323,7 @@
u_int dlt, hdrlen;
{
struct bpf_if *bp;
- bp = (struct bpf_if *)malloc(sizeof(*bp), M_BPF, M_DONTWAIT | M_ZERO);
+ bp = (struct bpf_if *)malloc(sizeof(*bp), M_BPF, M_NOWAIT | M_ZERO);
if (bp == 0)
panic("bpfattach");
Index: netinet6/frag6.c
===================================================================
RCS file: /home/dcvs/src/sys/netinet6/frag6.c,v
retrieving revision 1.3
diff -u -r1.3 frag6.c
--- netinet6/frag6.c 23 Aug 2003 11:02:45 -0000 1.3
+++ netinet6/frag6.c 9 Mar 2004 13:55:35 -0000
@@ -234,7 +234,7 @@
goto dropfrag;
frag6_nfragpackets++;
q6 = (struct ip6q *)malloc(sizeof(struct ip6q), M_FTABLE,
- M_DONTWAIT);
+ M_NOWAIT);
if (q6 == NULL)
goto dropfrag;
bzero(q6, sizeof(*q6));
@@ -326,7 +326,7 @@
}
ip6af = (struct ip6asfrag *)malloc(sizeof(struct ip6asfrag), M_FTABLE,
- M_DONTWAIT);
+ M_NOWAIT);
if (ip6af == NULL)
goto dropfrag;
bzero(ip6af, sizeof(*ip6af));
Attachment:
pgp00005.pgp
Description: PGP signature