Module Name: src
Committed By: christos
Date: Mon Oct 12 22:32:23 UTC 2009
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
unbreak sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet6/icmp6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.153 src/sys/netinet6/icmp6.c:1.154
--- src/sys/netinet6/icmp6.c:1.153 Wed Sep 16 11:23:05 2009
+++ src/sys/netinet6/icmp6.c Mon Oct 12 18:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.153 2009/09/16 15:23:05 pooka Exp $ */
+/* $NetBSD: icmp6.c,v 1.154 2009/10/12 22:32:23 christos Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.153 2009/09/16 15:23:05 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.154 2009/10/12 22:32:23 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2380,12 +2380,15 @@
* we almost always ask for an mbuf cluster for simplicity.
* (MHLEN < IPV6_MMTU is almost always true)
*/
-#if IPV6_MMTU >= MCLBYTES
-# error assumption failed about IPV6_MMTU and MCLBYTES
-#endif
MGETHDR(m, M_DONTWAIT, MT_HEADER);
- if (m && IPV6_MMTU >= MHLEN)
+ if (m && IPV6_MMTU >= MHLEN) {
+#if IPV6_MMTU >= MCLBYTES
+ _MCLGET(m, &mclpool_cache, IPV6_MMTU, M_DONTWAIT);
+#else
MCLGET(m, M_DONTWAIT);
+#endif
+ }
+
if (!m)
goto fail;
m->m_pkthdr.rcvif = NULL;
