From owner-p4-projects@FreeBSD.ORG  Fri Oct 20 20:53:42 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2BB8616A407; Fri, 20 Oct 2006 20:53:42 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 D30BD16A416
	for <perforce@freebsd.org>; Fri, 20 Oct 2006 20:53:41 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E54943D72
	for <perforce@freebsd.org>; Fri, 20 Oct 2006 20:53:41 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9KKrf0I049782
	for <perforce@freebsd.org>; Fri, 20 Oct 2006 20:53:41 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KKreIR049777
	for perforce@freebsd.org; Fri, 20 Oct 2006 20:53:40 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 20 Oct 2006 20:53:40 GMT
Message-Id: <200610202053.k9KKreIR049777@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108190 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 20 Oct 2006 20:53:42 -0000

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

Change 108190 by mjacob@newisp on 2006/10/20 20:52:59

	IFC

Affected files ...

.. //depot/projects/newisp/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/newisp/netinet/ip_input.c#2 integrate

Differences ...

==== //depot/projects/newisp/netinet/ip_fw_pfil.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.21 2006/05/12 04:41:27 mlaier Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.22 2006/10/20 19:32:08 julian Exp $
  */
 
 #if !defined(KLD_MODULE)
@@ -80,6 +80,14 @@
 /* ng_ipfw hooks. */
 ng_ipfw_input_t *ng_ipfw_input_p = NULL;
 
+/*
+ * ipfw_ether and ipfw_bridge hooks.
+ * XXX: Temporary until those are converted to pfil_hooks as well.
+ */
+ip_fw_chk_t *ip_fw_chk_ptr = NULL;
+ip_dn_io_t *ip_dn_io_ptr = NULL;
+int fw_one_pass = 1;
+
 /* Forward declarations. */
 static int	ipfw_divert(struct mbuf **, int, int);
 #define	DIV_DIR_IN	1

==== //depot/projects/newisp/netinet/ip_input.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_input.c,v 1.320 2006/08/17 00:37:03 julian Exp $
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.321 2006/10/20 19:32:08 julian Exp $
  */
 
 #include "opt_bootp.h"
@@ -77,10 +77,6 @@
 
 #include <sys/socketvar.h>
 
-/* XXX: Temporary until ipfw_ether and ipfw_bridge are converted. */
-#include <netinet/ip_fw.h>
-#include <netinet/ip_dummynet.h>
-
 int rsvp_on = 0;
 
 int	ipforwarding = 0;
@@ -192,14 +188,6 @@
     &ipstealth, 0, "");
 #endif
 
-/*
- * ipfw_ether and ipfw_bridge hooks.
- * XXX: Temporary until those are converted to pfil_hooks as well.
- */
-ip_fw_chk_t *ip_fw_chk_ptr = NULL;
-ip_dn_io_t *ip_dn_io_ptr = NULL;
-int fw_one_pass = 1;
-
 static void	ip_freef(struct ipqhead *, struct ipq *);
 
 /*