svn commit: r366531 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Thu Oct  8 04:00:31 2020
New Revision: 366531
URL: https://svnweb.freebsd.org/changeset/base/366531

Log:
  MFC r366287:
  
  Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
  complete description.

Modified:
  stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_nat.c	Thu Oct  8 02:56:11 2020	(r366530)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_nat.c	Thu Oct  8 04:00:31 2020	(r366531)
@@ -5116,8 +5116,8 @@ 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(__FreeBSD__)
+#if !defined(_KERNEL) || defined(MENTAT) || \
+    defined(BRIDGE_IPF) || defined(__FreeBSD__)
 	else {
 		/*
 		 * 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_daddr = nat->nat_ndstaddr;
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
-     defined(__osf__) || defined(linux)
+#if !defined(_KERNEL) || defined(MENTAT)
 		ipf_fix_outcksum(0, &fin->fin_ip->ip_sum, ipsumd, 0);
 #endif
 		break;