can't use M_WAIT here, i believe.

This commit is contained in:
itojun 2003-05-27 22:36:38 +00:00
parent 01c8c2e99a
commit f46a719b5c
2 changed files with 12 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: raw_ip.c,v 1.67 2003/02/26 06:31:15 matt Exp $ */
/* $NetBSD: raw_ip.c,v 1.68 2003/05/27 22:36:38 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.67 2003/02/26 06:31:15 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.68 2003/05/27 22:36:38 itojun Exp $");
#include "opt_ipsec.h"
#include "opt_mrouting.h"
@ -332,7 +332,9 @@ rip_output(m, va_alist)
m_freem(m);
return (EMSGSIZE);
}
M_PREPEND(m, sizeof(struct ip), M_WAIT);
M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
if (!m)
return (ENOBUFS);
ip = mtod(m, struct ip *);
ip->ip_tos = 0;
ip->ip_off = htons(0);

View File

@ -1,4 +1,4 @@
/* $NetBSD: raw_ip6.c,v 1.51 2002/09/11 02:46:47 itojun Exp $ */
/* $NetBSD: raw_ip6.c,v 1.52 2003/05/27 22:36:39 itojun Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.51 2002/09/11 02:46:47 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.52 2003/05/27 22:36:39 itojun Exp $");
#include "opt_ipsec.h"
@ -434,7 +434,11 @@ rip6_output(m, va_alist)
code = icmp6->icmp6_code;
}
M_PREPEND(m, sizeof(*ip6), M_WAIT);
M_PREPEND(m, sizeof(*ip6), M_DONTWAIT);
if (!m) {
error = ENOBUFS;
goto bad;
}
ip6 = mtod(m, struct ip6_hdr *);
/*