PERFORCE change 38448 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=38448

Change 38448 by sam at sam_ebb on 2003/09/22 16:17:51

	cope with net/pfil.h not being included by sys/protosw.h, etc.

Affected files ...

.. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#4 edit

Differences ...

==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#4 (text+ko) ====

@@ -71,6 +71,9 @@
 # if defined(_KERNEL) && !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif
+# if defined(_KERNEL) && (__FreeBSD_version >= 501108) && !defined(KLD_MODULE)
+#  include "opt_pfil_hooks.h"
+# endif
 #endif
 #ifdef __sgi
 #include <sys/debug.h>
@@ -592,7 +595,7 @@
 	pfil_remove_hook((void *)fr_check, PFIL_IN|PFIL_OUT);
 #  endif
 #  ifdef USE_INET6
-#   if __NetBSD_Version__ >= 105110000
+#   if (__NetBSD_Version__ >= 105110000) || (__FreeBSD_version >= 501108)
 	if (ph_inet6 != NULL)
 		error = pfil_remove_hook((void *)fr_check_wrapper6, NULL,
 					 PFIL_IN|PFIL_OUT, ph_inet6);