svn commit: r292811 - stable/10/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Sun Dec 27 23:25:21 2015
New Revision: 292811
URL: https://svnweb.freebsd.org/changeset/base/292811

Log:
  MFC r292518.
  
  Don't assume checksums will be calculated later when fastfoward is
  enabled (by default in r290383).
  
  PR:		72210

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_nat.c	Sun Dec 27 23:04:12 2015	(r292810)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_nat.c	Sun Dec 27 23:25:21 2015	(r292811)
@@ -5123,7 +5123,7 @@ ipf_nat_out(fin, nat, natadd, nflags)
 		ipf_fix_outcksum(0, &fin->fin_ip->ip_sum, msumd, 0);
 	}
 #if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
-    defined(linux) || defined(BRIDGE_IPF)
+    defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD__)
 	else {
 		/*
 		 * Strictly speaking, this isn't necessary on BSD
@@ -5235,7 +5235,7 @@ ipf_nat_out(fin, nat, natadd, nflags)
 		uh->uh_ulen += fin->fin_plen;
 		uh->uh_ulen = htons(uh->uh_ulen);
 #if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
-    defined(linux) || defined(BRIDGE_IPF)
+    defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD)
 		ipf_fix_outcksum(0, &ip->ip_sum, sumd, 0);
 #endif