diff options
author | bz <bz@FreeBSD.org> | 2012-07-31 05:44:03 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2012-07-31 05:44:03 +0000 |
commit | 712f939cb3d3a683ddbac7fdbf56303f087597ee (patch) | |
tree | bb2d6e6febac83f2e4b4360fcf71f312f5d0264b | |
parent | e07aa136d7d34b5af28c678970dc135100016444 (diff) | |
download | FreeBSD-src-712f939cb3d3a683ddbac7fdbf56303f087597ee.zip FreeBSD-src-712f939cb3d3a683ddbac7fdbf56303f087597ee.tar.gz |
Properly apply #ifdef INET and leave a comment that we are (will) apply
delayed IPv6 checksum processing in ip6_output.c when doing IPsec.
PR: kern/170116
MFC after: 3 days
-rw-r--r-- | sys/netinet6/ip6_ipsec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index a0f81c4..911ea8d 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -291,16 +291,16 @@ ip6_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error, /* * Do delayed checksums now because we send before * this is done in the normal processing path. - * XXX-BZ CSUM_DELAY_DATA_IPV6? + * For IPv6 we do delayed checksums in ip6_output.c. */ +#ifdef INET if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { ipseclog((LOG_DEBUG, "%s: we do not support IPv4 over IPv6", __func__)); -#ifdef INET in_delayed_cksum(*m); -#endif (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } +#endif /* * Preserve KAME behaviour: ENOENT can be returned |