diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-02-13 11:20:55 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-02-13 11:20:55 +0000 |
commit | af42e7d0a9ea75c2a69615c651be1cb608ce5aeb (patch) | |
tree | b093cb99fd3c02fb63119cdead4f4a2283027354 /sys/netinet6 | |
parent | 73424936ed603b855248b0b183adcfd05900f3ad (diff) |
Another chunk of IPv6 dead code bites the dust.
ok bluhm@, mikeb@
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/ip6_input.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index a992941f6cf..aa331b3e82d 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.122 2014/02/05 08:44:21 mpi Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.123 2014/02/13 11:20:54 mpi Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -497,28 +497,6 @@ ip6_input(struct mbuf *m) } } -#if 0 - { - /* - * Last resort: check in6_ifaddr for incoming interface. - * The code is here until I update the "goto ours hack" code above - * working right. - */ - struct ifaddr *ifa; - TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrlist, ifa_list) { - if (ifa->ifa_addr == NULL) - continue; /* just for safety */ - if (ifa->ifa_addr->sa_family != AF_INET6) - continue; - if (IN6_ARE_ADDR_EQUAL(IFA_IN6(ifa), &ip6->ip6_dst)) { - ours = 1; - deliverifp = ifa->ifa_ifp; - goto hbhcheck; - } - } - } -#endif - #if NCARP > 0 if (m->m_pkthdr.rcvif->if_type == IFT_CARP && ip6->ip6_nxt == IPPROTO_ICMPV6 && |