svn commit: r284575 - stable/10/sys/netinet6

[Kristof Provost]

Author: kp
Date: Thu Jun 18 20:45:37 2015
New Revision: 284575
URL: https://svnweb.freebsd.org/changeset/base/284575

Log:
  Merge r281165
  
  Remove duplicate code
  
  We'll just fall into the same local delivery block under the
  'if (m->m_flags & M_FASTFWD_OURS)'.
  
  Suggested by:       ae
  Differential Revision:	https://reviews.freebsd.org/D2820
  Reviewed by:	gnn

Modified:
  stable/10/sys/netinet6/ip6_forward.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet6/ip6_forward.c
==============================================================================
--- stable/10/sys/netinet6/ip6_forward.c	Thu Jun 18 20:43:16 2015	(r284574)
+++ stable/10/sys/netinet6/ip6_forward.c	Thu Jun 18 20:45:37 2015	(r284575)
@@ -557,22 +557,9 @@ again2:
 	if (!IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst)) {
 		m->m_flags |= M_SKIP_FIREWALL;
 		/* If destination is now ourself drop to ip6_input(). */
-		if (in6_localip(&ip6->ip6_dst)) {
+		if (in6_localip(&ip6->ip6_dst))
 			m->m_flags |= M_FASTFWD_OURS;
-			if (m->m_pkthdr.rcvif == NULL)
-				m->m_pkthdr.rcvif = V_loif;
-			if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) {
-				m->m_pkthdr.csum_flags |=
-				    CSUM_DATA_VALID_IPV6 | CSUM_PSEUDO_HDR;
-				m->m_pkthdr.csum_data = 0xffff;
-			}
-#ifdef SCTP
-			if (m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6)
-				m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
-#endif
-			error = netisr_queue(NETISR_IPV6, m);
-			goto out;
-		} else
+		else
 			goto again;	/* Redo the routing table lookup. */
 	}