Continued ipfilter #ifdef cleanup. The r343701 log entry contains a

complete description.

MFC after:	1 week
This commit is contained in:
Cy Schubert 2020-09-30 08:26:25 +00:00
parent 6dbd2fb858
commit d9bc41a1c2

View File

@ -5116,8 +5116,8 @@ ipf_nat_out(fin, nat, natadd, nflags)
ipf_fix_outcksum(0, &fin->fin_ip->ip_sum, msumd, 0); ipf_fix_outcksum(0, &fin->fin_ip->ip_sum, msumd, 0);
} }
#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \ #if !defined(_KERNEL) || defined(MENTAT) || \
defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD__) defined(BRIDGE_IPF) || defined(__FreeBSD__)
else { else {
/* /*
* Strictly speaking, this isn't necessary on BSD * Strictly speaking, this isn't necessary on BSD
@ -5631,8 +5631,7 @@ ipf_nat_in(fin, nat, natadd, nflags)
} }
fin->fin_ip->ip_dst = nat->nat_ndstip; fin->fin_ip->ip_dst = nat->nat_ndstip;
fin->fin_daddr = nat->nat_ndstaddr; fin->fin_daddr = nat->nat_ndstaddr;
#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \ #if !defined(_KERNEL) || defined(MENTAT)
defined(__osf__) || defined(linux)
ipf_fix_outcksum(0, &fin->fin_ip->ip_sum, ipsumd, 0); ipf_fix_outcksum(0, &fin->fin_ip->ip_sum, ipsumd, 0);
#endif #endif
break; break;