From owner-p4-projects@FreeBSD.ORG  Mon Sep 22 11:44:22 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F094B16A4D6; Mon, 22 Sep 2003 11:44:21 -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 CC10516A4B3
	for <perforce@freebsd.org>; Mon, 22 Sep 2003 11:44:21 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4781D43F75
	for <perforce@freebsd.org>; Mon, 22 Sep 2003 11:44:21 -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 h8MIiLXJ024361
	for <perforce@freebsd.org>; Mon, 22 Sep 2003 11:44:21 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8MIiKM3024358
	for perforce@freebsd.org; Mon, 22 Sep 2003 11:44:20 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Mon, 22 Sep 2003 11:44:20 -0700 (PDT)
Message-Id: <200309221844.h8MIiKM3024358@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 38431 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 18:44:22 -0000

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

Change 38431 by sam@sam_ebb on 2003/09/22 11:43:44

	Nuke pfil_head from protosw entries; no longer needed.
	
	Pointed out by: "Max Laier" <max@love2party.net>

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_output.c#6 edit
.. //depot/projects/netperf/sys/netinet6/ip6protosw.h#2 edit
.. //depot/projects/netperf/sys/sys/protosw.h#2 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_output.c#6 (text+ko) ====

@@ -65,6 +65,10 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 
+#ifdef PFIL_HOOKS
+#include <net/pfil.h>
+#endif
+
 #include <machine/in_cksum.h>
 
 static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options");

==== //depot/projects/netperf/sys/netinet6/ip6protosw.h#2 (text+ko) ====

@@ -72,11 +72,6 @@
 #define _NETINET6_IP6PROTOSW_H_
 
 /*
- * For pfil_head structure.
- */
-#include <net/pfil.h>
-
-/*
  * Protocol switch table for IPv6.
  * All other definitions should refer to sys/protosw.h
  */
@@ -153,7 +148,6 @@
 	void	(*pr_drain)		/* flush any excess space possible */
 			__P((void));
 	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-	struct	pfil_head	pr_pfh;
 };
 
 #ifdef _KERNEL

==== //depot/projects/netperf/sys/sys/protosw.h#2 (text+ko) ====

@@ -37,11 +37,6 @@
 #ifndef _SYS_PROTOSW_H_
 #define _SYS_PROTOSW_H_
 
-/*
- * For pfil_head structure.
- */
-#include <net/pfil.h>
-
 /* Forward declare these structures referenced from prototypes below. */
 struct mbuf;
 struct thread;
@@ -107,7 +102,6 @@
 	pr_drain_t *pr_drain;		/* flush any excess space possible */
 
 	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-	struct	pfil_head	pr_pfh;
 };
 /*#endif*/