[src/netbsd-1-6]: src/sys/netinet6 Pull up revision 1.62 (via manual patch) (...

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

details:   https://anonhg.NetBSD.org/src/rev/fc13686e9b2b
branches:  netbsd-1-6
changeset: 527728:fc13686e9b2b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jun 04 12:57:23 2002 +0000

description:
Pull up revision 1.62 (via manual patch) (requested by itojun in ticket #145):
do not hardcode if_mtu values in here, except for IFT_{ARC,FDDI} -
they need special handling.  makes it possible to take advantage of 9k ether
frames.

diffstat:

 sys/netinet6/nd6.c |  26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

diffs (58 lines):

diff -r 74c1e0099dde -r fc13686e9b2b sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Tue Jun 04 12:16:45 2002 +0000
+++ b/sys/netinet6/nd6.c        Tue Jun 04 12:57:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6.c,v 1.57 2002/03/20 22:47:59 itojun Exp $  */
+/*     $NetBSD: nd6.c,v 1.57.6.1 2002/06/04 12:57:23 lukem Exp $       */
 /*     $KAME: nd6.c,v 1.151 2001/06/19 14:24:41 sumikawa Exp $ */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.57 2002/03/20 22:47:59 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.57.6.1 2002/06/04 12:57:23 lukem Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,14 +51,12 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/if_atm.h>
-#include <net/if_ieee1394.h>
 #include <net/route.h>
+#include <net/if_ether.h>
+#include <net/if_fddi.h>
+#include <net/if_arc.h>
 
 #include <netinet/in.h>
-#include <net/if_ether.h>
-#include <netinet/if_inarp.h>
-#include <net/if_fddi.h>
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
@@ -207,17 +205,11 @@
        u_long oldlinkmtu = ndi->linkmtu;
 
        switch (ifp->if_type) {
-       case IFT_ARCNET:        /* XXX MTU handling needs more work */
-               ndi->maxmtu = MIN(60480, ifp->if_mtu);
-               break;
-       case IFT_ETHER:
-               ndi->maxmtu = MIN(ETHERMTU, ifp->if_mtu);
+       case IFT_ARCNET:
+               ndi->maxmtu = MIN(ARC_PHDS_MAXMTU, ifp->if_mtu); /* RFC2497 */
                break;
-       case IFT_ATM:
-               ndi->maxmtu = MIN(ATMMTU, ifp->if_mtu);
-               break;
-       case IFT_IEEE1394:
-               ndi->maxmtu = MIN(IEEE1394MTU, ifp->if_mtu);
+       case IFT_FDDI:
+               ndi->maxmtu = MIN(FDDIIPMTU, ifp->if_mtu);
                break;
        default:
                ndi->maxmtu = ifp->if_mtu;