From 1eb402e813e341c0ffe4a0663f0da4a6260e6dc9 Mon Sep 17 00:00:00 2001 From: itojun Date: Wed, 5 Jun 2002 01:10:54 +0000 Subject: [PATCH] be sure to use L3 MTU, not L2 MTU, when specified in spec (affects FDDI/ARCnet) --- sys/netinet6/nd6.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 0ae87d2ff32b..7bac5e0a55f9 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -1,5 +1,5 @@ -/* $NetBSD: nd6.h,v 1.28 2002/05/30 05:06:29 itojun Exp $ */ -/* $KAME: nd6.h,v 1.52 2001/02/19 04:40:37 itojun Exp $ */ +/* $NetBSD: nd6.h,v 1.29 2002/06/05 01:10:54 itojun Exp $ */ +/* $KAME: nd6.h,v 1.93 2002/06/05 00:56:22 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -99,7 +99,9 @@ struct nd_ifinfo { (((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->nd_ifinfo) #define IN6_LINKMTU(ifp) \ ((ND_IFINFO(ifp)->linkmtu && ND_IFINFO(ifp)->linkmtu < (ifp)->if_mtu) \ - ? ND_IFINFO(ifp)->linkmtu : (ifp)->if_mtu) + ? ND_IFINFO(ifp)->linkmtu \ + : ((ND_IFINFO(ifp)->maxmtu < (ifp)->if_mtu) \ + ? ND_IFINFO(ifp)->maxmtu : (ifp)->if_mtu)) #endif struct in6_nbrinfo {