From owner-svn-src-all@FreeBSD.ORG Sat Sep 21 03:57:56 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CECD138A; Sat, 21 Sep 2013 03:57:56 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BBCDB24B9; Sat, 21 Sep 2013 03:57:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8L3vu9A020585; Sat, 21 Sep 2013 03:57:56 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8L3vuW9020584; Sat, 21 Sep 2013 03:57:56 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201309210357.r8L3vuW9020584@svn.freebsd.org> From: Cy Schubert Date: Sat, 21 Sep 2013 03:57:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255754 - head/sys/contrib/ipfilter/netinet X-SVN-Group: head 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.14 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: Sat, 21 Sep 2013 03:57:56 -0000 Author: cy Date: Sat Sep 21 03:57:56 2013 New Revision: 255754 URL: http://svnweb.freebsd.org/changeset/base/255754 Log: Remove additional non-FreeBSD code. Approved by: glebius (mentor) Approved by: re (blanket) Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_compat.h Sat Sep 21 03:52:08 2013 (r255753) +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Sat Sep 21 03:57:56 2013 (r255754) @@ -37,24 +37,6 @@ !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6) # define USE_INET6 #endif -#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000) && \ - !defined(_KERNEL) && !defined(USE_INET6) -# define USE_INET6 -#endif -#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106140000) && \ - defined(_KERNEL) && \ - (!defined(IPFILTER_LKM) || (__NetBSD_Version__ >= 399000100)) -# define IPFILTER_M_IPFILTER -#endif -#if !defined(USE_INET6) -# if defined(OpenBSD) && (OpenBSD >= 200206) && \ - !defined(_KERNEL) && !defined(USE_INET6) -# define USE_INET6 -# endif -# if defined(HPUXREV) && (HPUXREV >= 1111) -# define USE_INET6 -# endif -#endif #if defined(__SVR4) || defined(__svr4__) || defined(__sgi) @@ -546,13 +528,8 @@ MALLOC_DECLARE(M_IPFILTER); # define GETIFMTU_6(x) ((struct ifnet *)x)->if_mtu # if !defined(USE_MUTEXES) && !defined(SPL_NET) -# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199407)) || \ - OPENBSD_GE_REV(200006) -# define SPL_NET(x) x = splsoftnet() -# else -# define SPL_IMP(x) x = splimp() -# define SPL_NET(x) x = splnet() -# endif /* NetBSD && (NetBSD <= 1991011) && (NetBSD >= 199407) */ +# define SPL_IMP(x) x = splimp() +# define SPL_NET(x) x = splnet() # if !defined(SPL_SCHED) # define SPL_SCHED(x) x = splsched() # endif