svn commit: r239831 - stable/9/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Wed Aug 29 13:14:39 2012
New Revision: 239831
URL: http://svn.freebsd.org/changeset/base/239831

Log:
  MFC r238935:
  
    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

Modified:
  stable/9/sys/netinet6/ip6_ipsec.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/ip6_ipsec.c
==============================================================================
--- stable/9/sys/netinet6/ip6_ipsec.c	Wed Aug 29 13:10:34 2012	(r239830)
+++ stable/9/sys/netinet6/ip6_ipsec.c	Wed Aug 29 13:14:39 2012	(r239831)
@@ -291,16 +291,16 @@ ip6_ipsec_output(struct mbuf **m, struct
 		/*
 		 * 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