summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkp <kp@FreeBSD.org>2015-04-06 19:08:44 +0000
committerkp <kp@FreeBSD.org>2015-04-06 19:08:44 +0000
commitb57f3509a8c9916991ca126e02c9e9bcecadcdeb (patch)
tree0c8bccb8cb45e8e8f74a85f525be5a14fe6a2b1e
parente192a810c5e18f99296cd0259c1055a90437bb34 (diff)
downloadFreeBSD-src-b57f3509a8c9916991ca126e02c9e9bcecadcdeb.zip
FreeBSD-src-b57f3509a8c9916991ca126e02c9e9bcecadcdeb.tar.gz
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/D2225 Approved by: gnn (mentor)
-rw-r--r--sys/netinet6/ip6_forward.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index d66b674..e79baba 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -537,22 +537,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. */
}
OpenPOWER on IntegriCloud