Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 21 Sep 2013 03:57:56 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r255754 - head/sys/contrib/ipfilter/netinet
Message-ID:  <201309210357.r8L3vuW9020584@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309210357.r8L3vuW9020584>