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

[Cy Schubert]

Author: cy
Date: Mon Dec 31 03:53:33 2018
New Revision: 342641
URL: https://svnweb.freebsd.org/changeset/base/342641

Log:
  MFC r342385:
  
  Remove an empty #if block.
  
  The interesting thing is that looking through Darren's commit logs,
  the line containing an extern ppsratecheck() definition was removed
  from the v5-1-RELEASE branch but not from HEAD (I have taken his
  CVS tree and converted it to GIT). There is a commit adding an
  additional #if defined to the empty block. I can only assume that
  this was intentional for something later. Looking through HEAD the
  extern ppsratecheck() is there. However if we put it back it would
  conflict with a static ppsratecheck() definition in fil.c when
  building ipftest.
  
  Therefore we remove this empty block.
  
  ppsratecheck() is a function in the FreeBSD kernel. However ipftest
  cannot call the ppsratecheck() in the kernel. Therefore one exists in
  fil.c for use when building the userland ipftest utility which
  approximates the packet filter in userland for testing of ipfilter
  rules against packets captured with tcpdump.

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

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

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_fil.h	Mon Dec 31 03:08:01 2018	(r342640)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_fil.h	Mon Dec 31 03:53:33 2018	(r342641)
@@ -1813,9 +1813,6 @@ extern	int	ipf_resolvefunc __P((ipf_main_softc_t *, vo
 extern	void	*ipf_resolvenic __P((ipf_main_softc_t *, char *, int));
 extern	int	ipf_send_icmp_err __P((int, fr_info_t *, int));
 extern	int	ipf_send_reset __P((fr_info_t *));
-#if  (defined(__FreeBSD_version) && (__FreeBSD_version < 501000)) || \
-     !defined(_KERNEL) || defined(linux)
-#endif
 extern	void	ipf_apply_timeout __P((ipftq_t *, u_int));
 extern	ipftq_t	*ipf_addtimeoutqueue __P((ipf_main_softc_t *, ipftq_t **,
 					  u_int));