From owner-svn-src-stable@freebsd.org  Wed Mar 16 02:01:18 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58A62AD11AC;
 Wed, 16 Mar 2016 02:01:18 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 29A87D50;
 Wed, 16 Mar 2016 02:01:18 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2G21H2i067328;
 Wed, 16 Mar 2016 02:01:17 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2G21HnS067327;
 Wed, 16 Mar 2016 02:01:17 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201603160201.u2G21HnS067327@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 16 Mar 2016 02:01:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r296924 - stable/9/sys/contrib/ipfilter/netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Mar 2016 02:01:18 -0000

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