From owner-svn-src-all@freebsd.org Thu Mar 5 06:35:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 091CF25F554; Thu, 5 Mar 2020 06:35:09 +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 48Y1Fm50jmz4Ff5; Thu, 5 Mar 2020 06:35:08 +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 311682E56; Thu, 5 Mar 2020 06:35:08 +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 0256Z8q8064901; Thu, 5 Mar 2020 06:35:08 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0256Z779064895; Thu, 5 Mar 2020 06:35:07 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202003050635.0256Z779064895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 5 Mar 2020 06:35:07 +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: r358664 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet X-SVN-Group: stable-12 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet X-SVN-Commit-Revision: 358664 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2020 06:35:09 -0000 Author: cy Date: Thu Mar 5 06:35:05 2020 New Revision: 358664 URL: https://svnweb.freebsd.org/changeset/base/358664 Log: MFC r358558: Continuing the effort started in r343701, #ifdef cleanup, checking for __FreeBSD_version > 3.0 and 5.0 is redundant. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h stable/12/sys/contrib/ipfilter/netinet/ip_fil.h stable/12/sys/contrib/ipfilter/netinet/ip_proxy.c stable/12/sys/contrib/ipfilter/netinet/ip_state.c stable/12/sys/contrib/ipfilter/netinet/ip_sync.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h stable/11/sys/contrib/ipfilter/netinet/ip_fil.h stable/11/sys/contrib/ipfilter/netinet/ip_proxy.c stable/11/sys/contrib/ipfilter/netinet/ip_state.c stable/11/sys/contrib/ipfilter/netinet/ip_sync.c Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h ============================================================================== --- stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Thu Mar 5 06:21:00 2020 (r358663) +++ stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Thu Mar 5 06:35:05 2020 (r358664) @@ -126,7 +126,7 @@ * There may be other, safe, kernels but this is not extensively tested yet. */ # define HAVE_M_PULLDOWN -# if !defined(IPFILTER_LKM) && (__FreeBSD_version >= 300000) +# if !defined(IPFILTER_LKM) && defined(__FreeBSD_version) # include "opt_ipfilter.h" # endif # define COPYIN(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c)) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil.h ============================================================================== --- stable/12/sys/contrib/ipfilter/netinet/ip_fil.h Thu Mar 5 06:21:00 2020 (r358663) +++ stable/12/sys/contrib/ipfilter/netinet/ip_fil.h Thu Mar 5 06:35:05 2020 (r358664) @@ -1420,8 +1420,7 @@ typedef struct ipftune { ** HPUX Port */ -#if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) && \ - (__FreeBSD_version >= 220000) +#if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) # define CDEV_MAJOR 79 #endif Modified: stable/12/sys/contrib/ipfilter/netinet/ip_proxy.c ============================================================================== --- stable/12/sys/contrib/ipfilter/netinet/ip_proxy.c Thu Mar 5 06:21:00 2020 (r358663) +++ stable/12/sys/contrib/ipfilter/netinet/ip_proxy.c Thu Mar 5 06:35:05 2020 (r358664) @@ -51,7 +51,7 @@ # include # include #endif -#if __FreeBSD_version >= 300000 +#ifdef __FreeBSD_version # include #endif #include Modified: stable/12/sys/contrib/ipfilter/netinet/ip_state.c ============================================================================== --- stable/12/sys/contrib/ipfilter/netinet/ip_state.c Thu Mar 5 06:21:00 2020 (r358663) +++ stable/12/sys/contrib/ipfilter/netinet/ip_state.c Thu Mar 5 06:35:05 2020 (r358664) @@ -82,7 +82,7 @@ #ifdef USE_INET6 #include #endif -#if FREEBSD_GE_REV(300000) +#ifdef __FreeBSD_version # include # if defined(_KERNEL) && !defined(IPFILTER_LKM) # include @@ -307,7 +307,7 @@ ipf_state_seed_alloc(u_int state_size, u_int state_max /* * XXX - ipf_state_seed[X] should be a random number of sorts. */ -#if FREEBSD_GE_REV(400000) +#ifdef __FreeBSD_version state_seed[i] = arc4random(); #else state_seed[i] = ((u_long)state_seed + i) * state_size; Modified: stable/12/sys/contrib/ipfilter/netinet/ip_sync.c ============================================================================== --- stable/12/sys/contrib/ipfilter/netinet/ip_sync.c Thu Mar 5 06:21:00 2020 (r358663) +++ stable/12/sys/contrib/ipfilter/netinet/ip_sync.c Thu Mar 5 06:35:05 2020 (r358664) @@ -30,7 +30,7 @@ # include # endif # include -# if __FreeBSD_version >= 500000 +# ifdef __FreeBSD_version # include # endif #endif