[src/netbsd-1-6]: src/sys/netinet6 Pullup rev 1.65 (requested by itojun in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/7cde6f8a6a31
branches:  netbsd-1-6
changeset: 531389:7cde6f8a6a31
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jun 14 02:48:00 2004 +0000

description:
Pullup rev 1.65 (requested by itojun in ticket #1709)

Implement IPV6_USE_MIN_MTU sockopt.

diffstat:

 sys/netinet6/raw_ip6.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 7e3fc79b2742 -r 7cde6f8a6a31 sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Mon Jun 14 02:47:57 2004 +0000
+++ b/sys/netinet6/raw_ip6.c    Mon Jun 14 02:48:00 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.42 2002/03/19 01:21:19 itojun Exp $      */
+/*     $NetBSD: raw_ip6.c,v 1.42.6.1 2004/06/14 02:48:00 jmc 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.42 2002/03/19 01:21:19 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.42.6.1 2004/06/14 02:48:00 jmc Exp $");
 
 #include "opt_ipsec.h"
 
@@ -515,10 +515,8 @@
 #endif /* IPSEC */
 
        flags = 0;
-#ifdef IN6P_MINMTU
        if (in6p->in6p_flags & IN6P_MINMTU)
                flags |= IPV6_MINMTU;
-#endif
        
        error = ip6_output(m, optp, &in6p->in6p_route, flags,
            in6p->in6p_moptions, &oifp);