[src/trunk]: src/sys/netinet6 unbreak sun2.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e2e8eba8155
branches:  trunk
changeset: 748076:1e2e8eba8155
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Oct 12 22:32:23 2009 +0000

description:
unbreak sun2.

diffstat:

 sys/netinet6/icmp6.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r f98587f5d8d0 -r 1e2e8eba8155 sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Mon Oct 12 22:29:16 2009 +0000
+++ b/sys/netinet6/icmp6.c      Mon Oct 12 22:32:23 2009 +0000
@@ -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)
         */
+       MGETHDR(m, M_DONTWAIT, MT_HEADER);
+       if (m && IPV6_MMTU >= MHLEN) {
 #if IPV6_MMTU >= MCLBYTES
-# error assumption failed about IPV6_MMTU and MCLBYTES
+               _MCLGET(m, &mclpool_cache, IPV6_MMTU, M_DONTWAIT);
+#else
+               MCLGET(m, M_DONTWAIT);
 #endif
-       MGETHDR(m, M_DONTWAIT, MT_HEADER);
-       if (m && IPV6_MMTU >= MHLEN)
-               MCLGET(m, M_DONTWAIT);
+       }
+
        if (!m)
                goto fail;
        m->m_pkthdr.rcvif = NULL;