diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-06-05 01:12:55 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-06-05 01:12:55 +0000 |
| commit | d004f351ba0764f367cb59a328f88460354c5dd3 (patch) | |
| tree | 9befabecbc2e952afd0668e2fca56f80a4e54fb8 /sys | |
| parent | 48975e8bd67fba43fce4dab4fa289a05a3ce124a (diff) | |
be sure to use L3 MTU, not L2 MTU, when specified in spec (affects FDDI/ARCnet)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet6/nd6.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index ce113e1190c..859f378f668 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -1,5 +1,5 @@ -/* $OpenBSD: nd6.h,v 1.19 2002/05/30 05:07:17 itojun Exp $ */ -/* $KAME: nd6.h,v 1.52 2001/02/19 04:40:37 itojun Exp $ */ +/* $OpenBSD: nd6.h,v 1.20 2002/06/05 01:12: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 { |