[Midnightbsd-cvs] src: sys/netinet6: icmp ipv6

[laffer1 at midnightbsd.org]

Log Message:
-----------
icmp ipv6

Modified Files:
--------------
    src/sys/netinet6:
        icmp6.c (r1.4 -> r1.5)
        icmp6.c.orig (r1.1 -> r1.2)

-------------- next part --------------
Index: icmp6.c.orig
===================================================================
RCS file: /home/cvs/src/sys/netinet6/icmp6.c.orig,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/netinet6/icmp6.c.orig -L sys/netinet6/icmp6.c.orig -u -r1.1 -r1.2
--- sys/netinet6/icmp6.c.orig
+++ sys/netinet6/icmp6.c.orig
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*	$FreeBSD: src/sys/netinet6/icmp6.c,v 1.80 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $	*/
 
Index: icmp6.c
===================================================================
RCS file: /home/cvs/src/sys/netinet6/icmp6.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/netinet6/icmp6.c -L sys/netinet6/icmp6.c -u -r1.4 -r1.5
--- sys/netinet6/icmp6.c
+++ sys/netinet6/icmp6.c
@@ -1118,6 +1118,15 @@
 	if (!validated)
 		return;
 
+	/*
+	 * In case the suggested mtu is less than IPV6_MMTU, we
+	 * only need to remember that it was for above mentioned
+	 * "alwaysfrag" case.
+	 * Try to be as close to the spec as possible.
+	 */
+	if (mtu < IPV6_MMTU)
+		mtu = IPV6_MMTU - 8;
+
 	bzero(&inc, sizeof(inc));
 	inc.inc_flags = 1; /* IPv6 */
 	inc.inc6_faddr = *dst;