summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-28 07:46:42 -0200
committerRenato Botelho <renato@netgate.com>2015-12-28 07:46:42 -0200
commit0319542cc712df59c57f014b4f925f516bcb5b4b (patch)
treed471c26ca5a9ed2a730a1bbb6781f4e08c79a939 /sys/contrib
parent3f9b44b7cebbdee8202dd56d8c57ac81b13114e1 (diff)
parent70f106975f9e06a5c50c4dfa06fb3b3d41d1780f (diff)
downloadFreeBSD-src-0319542cc712df59c57f014b4f925f516bcb5b4b.zip
FreeBSD-src-0319542cc712df59c57f014b4f925f516bcb5b4b.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index 6c93810..6ca938a 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -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
OpenPOWER on IntegriCloud