From owner-p4-projects@FreeBSD.ORG  Mon Sep 22 16:18:04 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2FE416A4C0; Mon, 22 Sep 2003 16:18:03 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9DBEA16A4B3
	for <perforce@freebsd.org>; Mon, 22 Sep 2003 16:18:03 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DDEE543FF9
	for <perforce@freebsd.org>; Mon, 22 Sep 2003 16:18:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8MNI2XJ055377
	for <perforce@freebsd.org>; Mon, 22 Sep 2003 16:18:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8MNI2us055373
	for perforce@freebsd.org; Mon, 22 Sep 2003 16:18:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Mon, 22 Sep 2003 16:18:02 -0700 (PDT)
Message-Id: <200309222318.h8MNI2us055373@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38448 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Sep 2003 23:18:04 -0000

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

Change 38448 by sam@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);