svn commit: r296924 - stable/9/sys/contrib/ipfilter/netinet

Cy Schubert cy at FreeBSD.org
Wed Mar 16 02:01:18 UTC 2016


Author: cy
Date: Wed Mar 16 02:01:17 2016
New Revision: 296924
URL: https://svnweb.freebsd.org/changeset/base/296924

Log:
  Don't assume checksums will be calculated later when fastfoward is
  enabled.
  
  This is a direct commit to the stable/9 because this branch uses
  ipfilter 4.1.28 whereas head has ipfilter 5.1.2. This corresponds
  to r292518 and r292813 in head and r292979 and r292811 in stable/10.
  
  PR:		72210

Modified:
  stable/9/sys/contrib/ipfilter/netinet/ip_nat.c

Modified: stable/9/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/9/sys/contrib/ipfilter/netinet/ip_nat.c	Wed Mar 16 01:48:32 2016	(r296923)
+++ stable/9/sys/contrib/ipfilter/netinet/ip_nat.c	Wed Mar 16 02:01:17 2016	(r296924)
@@ -3956,7 +3956,7 @@ u_32_t nflags;
 			fix_outcksum(fin, &fin->fin_ip->ip_sum, sumd);
 		}
 #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


More information about the svn-src-all mailing list