svn commit: r292518 - head/sys/contrib/ipfilter/netinet
Cy Schubert
cy at FreeBSD.org
Sun Dec 20 18:02:14 UTC 2015
Author: cy
Date: Sun Dec 20 18:02:13 2015
New Revision: 292518
URL: https://svnweb.freebsd.org/changeset/base/292518
Log:
Don't assume checksums will be calculated later when fastfoward is
enabled (by default in r290383).
PR: 72210
MFC after: 1 week
Modified:
head/sys/contrib/ipfilter/netinet/ip_nat.c
Modified: head/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_nat.c Sun Dec 20 16:40:36 2015 (r292517)
+++ head/sys/contrib/ipfilter/netinet/ip_nat.c Sun Dec 20 18:02:13 2015 (r292518)
@@ -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
More information about the svn-src-all
mailing list