From owner-svn-src-all@freebsd.org  Tue Jun 11 03:06:38 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02DF615A874F;
 Tue, 11 Jun 2019 03:06:37 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 91840709B1;
 Tue, 11 Jun 2019 03:06:37 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6731423935;
 Tue, 11 Jun 2019 03:06:37 +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 x5B36bn2058708;
 Tue, 11 Jun 2019 03:06:37 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5B36bW0058706;
 Tue, 11 Jun 2019 03:06:37 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201906110306.x5B36bW0058706@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: Tue, 11 Jun 2019 03:06:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r348889 - stable/12/sys/contrib/ipfilter/netinet
X-SVN-Group: stable-12
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: stable/12/sys/contrib/ipfilter/netinet
X-SVN-Commit-Revision: 348889
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 91840709B1
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0];
 NEURAL_HAM_SHORT(-0.97)[-0.971,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jun 2019 03:06:38 -0000

Author: cy
Date: Tue Jun 11 03:06:36 2019
New Revision: 348889
URL: https://svnweb.freebsd.org/changeset/base/348889

Log:
  MFC r348666:
  
  Clean up #ifdefs from old unsupported releases of FreeBSD.

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

Modified: stable/12/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/fil.c	Tue Jun 11 01:09:54 2019	(r348888)
+++ stable/12/sys/contrib/ipfilter/netinet/fil.c	Tue Jun 11 03:06:36 2019	(r348889)
@@ -2882,8 +2882,7 @@ ipf_check(ctx, ip, hlen, ifp, out
 	 */
 	m->m_flags &= ~M_CANFASTFWD;
 #  endif /* M_CANFASTFWD */
-#  if defined(CSUM_DELAY_DATA) && (!defined(__FreeBSD_version) || \
-				   (__FreeBSD_version < 501108))
+#  if defined(CSUM_DELAY_DATA) && !defined(__FreeBSD_version)
 	/*
 	 * disable delayed checksums.
 	 */

Modified: stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c	Tue Jun 11 01:09:54 2019	(r348888)
+++ stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c	Tue Jun 11 03:06:36 2019	(r348889)
@@ -22,19 +22,19 @@
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/select.h>
-#if __FreeBSD_version >= 500000
+#ifdef __FreeBSD_version
 # include <sys/selinfo.h>
 # include <sys/jail.h>
+# ifdef _KERNEL
+#  include <net/vnet.h>
+# else
+#  define CURVNET_SET(arg)
+#  define CURVNET_RESTORE()
+#  define	VNET_DEFINE(_t, _v)	_t _v
+#  define	VNET_DECLARE(_t, _v)	extern _t _v
+#  define	VNET(arg)	arg
+# endif
 #endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL)
-#include <net/vnet.h>
-#else
-#define CURVNET_SET(arg)
-#define CURVNET_RESTORE()
-#define	VNET_DEFINE(_t, _v)	_t _v
-#define	VNET_DECLARE(_t, _v)	extern _t _v
-#define	VNET(arg)	arg
-#endif
 #include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -52,7 +52,7 @@
 VNET_DECLARE(ipf_main_softc_t, ipfmain);
 #define	V_ipfmain		VNET(ipfmain)
 
-#if __FreeBSD_version >= 502116
+#ifdef __FreeBSD_version
 static struct cdev *ipf_devs[IPL_LOGSIZE];
 #else
 static dev_t ipf_devs[IPL_LOGSIZE];
@@ -68,25 +68,17 @@ static int ipf_modunload(void);
 static int ipf_fbsd_sysctl_create(void);
 static int ipf_fbsd_sysctl_destroy(void);
 
-#if (__FreeBSD_version >= 500024)
-# if (__FreeBSD_version >= 502116)
+#ifdef __FreeBSD_version
 static	int	ipfopen __P((struct cdev*, int, int, struct thread *));
 static	int	ipfclose __P((struct cdev*, int, int, struct thread *));
-# else
-static	int	ipfopen __P((dev_t, int, int, struct thread *));
-static	int	ipfclose __P((dev_t, int, int, struct thread *));
-# endif /* __FreeBSD_version >= 502116 */
-#else
-static	int	ipfopen __P((dev_t, int, int, struct proc *));
-static	int	ipfclose __P((dev_t, int, int, struct proc *));
-#endif
-#if (__FreeBSD_version >= 502116)
 static	int	ipfread __P((struct cdev*, struct uio *, int));
 static	int	ipfwrite __P((struct cdev*, struct uio *, int));
 #else
+static	int	ipfopen __P((dev_t, int, int, struct proc *));
+static	int	ipfclose __P((dev_t, int, int, struct proc *));
 static	int	ipfread __P((dev_t, struct uio *, int));
 static	int	ipfwrite __P((dev_t, struct uio *, int));
-#endif /* __FreeBSD_version >= 502116 */
+#endif
 
 
 SYSCTL_DECL(_net_inet);
@@ -137,15 +129,13 @@ SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_minttl, CTLFLAG
 
 #define CDEV_MAJOR 79
 #include <sys/poll.h>
-#if __FreeBSD_version >= 500043
+#ifdef __FreeBSD_version
 # include <sys/select.h>
 static int ipfpoll(struct cdev *dev, int events, struct thread *td);
 
 static struct cdevsw ipf_cdevsw = {
-#if __FreeBSD_version >= 502103
 	.d_version =	D_VERSION,
 	.d_flags =	0,	/* D_NEEDGIANT - Should be SMP safe */
-#endif
 	.d_open =	ipfopen,
 	.d_close =	ipfclose,
 	.d_read =	ipfread,
@@ -153,9 +143,6 @@ static struct cdevsw ipf_cdevsw = {
 	.d_ioctl =	ipfioctl,
 	.d_poll =	ipfpoll,
 	.d_name =	"ipf",
-#if __FreeBSD_version < 600000
-	.d_maj =	CDEV_MAJOR,
-#endif
 };
 #else
 static int ipfpoll(dev_t dev, int events, struct proc *td);
@@ -174,12 +161,6 @@ static struct cdevsw ipf_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-# if (__FreeBSD_version < 500043)
-	/* bmaj */	-1,
-# endif
-# if (__FreeBSD_version >= 430000)
-	/* kqfilter */	NULL
-# endif
 };
 #endif
 
@@ -444,7 +425,7 @@ sysctl_ipf_int_frag ( SYSCTL_HANDLER_ARGS )
 
 
 static int
-#if __FreeBSD_version >= 500043
+#ifdef __FreeBSD_version
 ipfpoll(struct cdev *dev, int events, struct thread *td)
 #else
 ipfpoll(dev_t dev, int events, struct proc *td)
@@ -497,20 +478,13 @@ ipfpoll(dev_t dev, int events, struct proc *td)
  * routines below for saving IP headers to buffer
  */
 static int ipfopen(dev, flags
-#if ((BSD >= 199506) || (__FreeBSD_version >= 220000))
+#ifdef __FreeBSD_version
 , devtype, p)
 	int devtype;
-# if (__FreeBSD_version >= 500024)
 	struct thread *p;
-# else
-	struct proc *p;
-# endif /* __FreeBSD_version >= 500024 */
-#else
-)
-#endif
-#if (__FreeBSD_version >= 502116)
 	struct cdev *dev;
 #else
+)
 	dev_t dev;
 #endif
 	int flags;
@@ -544,20 +518,13 @@ static int ipfopen(dev, flags
 
 
 static int ipfclose(dev, flags
-#if ((BSD >= 199506) || (__FreeBSD_version >= 220000))
+#ifdef __FreeBSD_version
 , devtype, p)
 	int devtype;
-# if (__FreeBSD_version >= 500024)
 	struct thread *p;
-# else
-	struct proc *p;
-# endif /* __FreeBSD_version >= 500024 */
-#else
-)
-#endif
-#if (__FreeBSD_version >= 502116)
 	struct cdev *dev;
 #else
+)
 	dev_t dev;
 #endif
 	int flags;
@@ -583,7 +550,7 @@ static int ipfread(dev, uio, ioflag)
 #else
 static int ipfread(dev, uio)
 #endif
-#if (__FreeBSD_version >= 502116)
+#ifdef __FreeBSD_version
 	struct cdev *dev;
 #else
 	dev_t dev;
@@ -630,7 +597,7 @@ static int ipfwrite(dev, uio, ioflag)
 #else
 static int ipfwrite(dev, uio)
 #endif
-#if (__FreeBSD_version >= 502116)
+#ifdef __FreeBSD_version
 	struct cdev *dev;
 #else
 	dev_t dev;