From 0c16805fafc1c4948896949b53a45cd12b23c792 Mon Sep 17 00:00:00 2001 From: Jun-ichiro itojun Hagino Date: Wed, 29 May 2002 07:55:00 +0000 Subject: attach nd_ifinfo structure to if_afdata. split IPv6 MTU (advertised by RA) from real link MTU. sync with kame --- sys/netinet6/nd6_nbr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/netinet6/nd6_nbr.c') diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index e3e75e321ad..e3819b9d051 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.22 2002/05/28 10:34:11 itojun Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.23 2002/05/29 07:54:59 itojun Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -650,7 +650,7 @@ nd6_na_input(m, off, icmp6len) ln->ln_byhint = 0; if (ln->ln_expire) ln->ln_expire = time.tv_sec + - nd_ifinfo[rt->rt_ifp->if_index].reachable; + ND_IFINFO(rt->rt_ifp)->reachable; } else { ln->ln_state = ND6_LLINFO_STALE; ln->ln_expire = time.tv_sec + nd6_gctimer; @@ -724,7 +724,7 @@ nd6_na_input(m, off, icmp6len) ln->ln_byhint = 0; if (ln->ln_expire) { ln->ln_expire = time.tv_sec + - nd_ifinfo[ifp->if_index].reachable; + ND_IFINFO(ifp)->reachable; } } else { if (lladdr && llchange) { @@ -1071,7 +1071,7 @@ nd6_dad_start(ifa, tick) if (tick == NULL) { nd6_dad_ns_output(dp, ifa); nd6_dad_starttimer(dp, - nd_ifinfo[ifa->ifa_ifp->if_index].retrans * hz / 1000); + ND6_RETRANS_SEC(ND_IFINFO(ifa->ifa_ifp)->retrans) * hz); } else { int ntick; @@ -1163,7 +1163,7 @@ nd6_dad_timer(ifa) */ nd6_dad_ns_output(dp, ifa); nd6_dad_starttimer(dp, - nd_ifinfo[ifa->ifa_ifp->if_index].retrans * hz / 1000); + ND6_RETRANS_SEC(ND_IFINFO(ifa->ifa_ifp)->retrans) * hz); } else { /* * We have transmitted sufficient number of DAD packets. -- cgit v1.2.3