From cf4bbc2baa0d5292d7323ac142736793bf094f86 Mon Sep 17 00:00:00 2001 From: mpi Date: Thu, 22 Oct 2015 10:22:53 +0000 Subject: [PATCH] Kill dead code missed in per-ifp counter removal. ok millert@, bluhm@ --- sys/netinet6/frag6.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 3e27729e1d6..8c09815cd3f 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.64 2015/10/19 11:59:26 mpi Exp $ */ +/* $OpenBSD: frag6.c,v 1.65 2015/10/22 10:22:53 mpi Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -164,9 +164,6 @@ frag6_input(struct mbuf **mp, int *offp, int proto) int offset = *offp, nxt, i, next; int first_frag = 0; int fragoff, frgpartlen; /* must be larger than u_int16_t */ - struct ifnet *dstifp; - struct sockaddr_in6 dst; - struct rtentry *rt; u_int8_t ecn, ecn0; ip6 = mtod(m, struct ip6_hdr *); @@ -174,21 +171,6 @@ frag6_input(struct mbuf **mp, int *offp, int proto) if (ip6f == NULL) return IPPROTO_DONE; - dstifp = NULL; - /* find the destination interface of the packet. */ - memset(&dst, 0, sizeof(dst)); - dst.sin6_family = AF_INET6; - dst.sin6_len = sizeof(struct sockaddr_in6); - dst.sin6_addr = ip6->ip6_dst; - - rt = rtalloc_mpath(sin6tosa(&dst), &ip6->ip6_src.s6_addr32[0], - m->m_pkthdr.ph_rtableid); - if (rt != NULL) { - dstifp = ifatoia6(rt->rt_ifa)->ia_ifp; - rtfree(rt); - rt = NULL; - } - /* jumbo payload can't contain a fragment header */ if (ip6->ip6_plen == 0) { icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, offset); -- 2.20.1