diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-10-25 15:02:00 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-10-25 15:02:00 +0000 |
| commit | d6302bcdf9be16e6367be2cf724b815bcef17e5b (patch) | |
| tree | fbadae07ba1b468b8f2b12408bdc907a7e1f9f1b /sys/netinet6 | |
| parent | 6f40f08b521f466b43a6cb87e1774729b179896f (diff) | |
Trivial rt_ifp->if_index -> rt_ifidx conversions.
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index d152d42c235..d6a74dc2b01 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.83 2015/10/19 12:11:28 mpi Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.84 2015/10/25 15:01:59 mpi Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -283,7 +283,7 @@ reroute: * [draft-ietf-ipngwg-icmp-v3-00.txt, Section 3.1] */ if (in6_addr2scopeid(m->m_pkthdr.ph_ifidx, &ip6->ip6_src) != - in6_addr2scopeid(rt->rt_ifp->if_index, &ip6->ip6_src)) { + in6_addr2scopeid(rt->rt_ifidx, &ip6->ip6_src)) { ip6stat.ip6s_cantforward++; ip6stat.ip6s_badscope++; @@ -296,7 +296,7 @@ reroute: "src %s, dst %s, nxt %d, rcvif %u, outif %u\n", src6, dst6, ip6->ip6_nxt, - m->m_pkthdr.ph_ifidx, rt->rt_ifp->if_index); + m->m_pkthdr.ph_ifidx, rt->rt_ifidx); } if (mcopy) icmp6_error(mcopy, ICMP6_DST_UNREACH, diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index f1692dc6dab..2df9f8963ad 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.160 2015/10/25 11:58:11 mpi Exp $ */ +/* $OpenBSD: nd6.c,v 1.161 2015/10/25 15:01:59 mpi Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -421,7 +421,7 @@ nd6_llinfo_timer(void *arg) * XXX: should we consider * older rcvif? */ - m->m_pkthdr.ph_ifidx = rt->rt_ifp->if_index; + m->m_pkthdr.ph_ifidx = rt->rt_ifidx; icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR, 0); |