diff options
| author | kp <kp@FreeBSD.org> | 2015-06-18 20:45:37 +0000 |
|---|---|---|
| committer | kp <kp@FreeBSD.org> | 2015-06-18 20:45:37 +0000 |
| commit | 801d5721d10bb679d21776f0f8f4d459d302c588 (patch) | |
| tree | 8af382a58fd8216dcb32ad1e686aae2693f94e83 /sys/netinet6 | |
| parent | 99baa6b1d18f006fad909ae16fe2517b415de48f (diff) | |
| download | FreeBSD-src-801d5721d10bb679d21776f0f8f4d459d302c588.zip FreeBSD-src-801d5721d10bb679d21776f0f8f4d459d302c588.tar.gz | |
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
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 6e2bec9..a22c084 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -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. */ } |
