From owner-p4-projects@FreeBSD.ORG  Mon May 31 16:41:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C22816A4D0; Mon, 31 May 2004 16:41:46 -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 60BF916A4CE
	for <perforce@freebsd.org>; Mon, 31 May 2004 16:41:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 40B9043D45
	for <perforce@freebsd.org>; Mon, 31 May 2004 16:41:46 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VNfjlA076458
	for <perforce@freebsd.org>; Mon, 31 May 2004 16:41:45 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VNfj67076448
	for perforce@freebsd.org; Mon, 31 May 2004 16:41:45 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 31 May 2004 16:41:45 -0700 (PDT)
Message-Id: <200405312341.i4VNfj67076448@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 53912 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, 31 May 2004 23:41:47 -0000

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

Change 53912 by rwatson@rwatson_tislabs on 2004/05/31 16:41:26

	Integrate netperf_socket from FreeBSD CVS HEAD:
	
	- module.h include fixes.

Affected files ...

.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#6 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.5 2004/04/14 00:57:49 brooks Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.6 2004/05/31 22:48:19 mlaier Exp $	*/
 /*	$OpenBSD: if_pflog.c,v 1.9 2003/05/14 08:42:00 canacar Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -56,6 +56,7 @@
 #ifdef __FreeBSD__
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/sockio.h>
 #else
 #include <sys/ioctl.h>

==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.5 2004/04/14 00:57:49 brooks Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.6 2004/05/31 22:48:19 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.6 2003/06/21 09:07:01 djm Exp $	*/
 
 /*
@@ -50,6 +50,7 @@
 #ifdef __FreeBSD__
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/sockio.h>
 #else
 #include <sys/ioctl.h>

==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.6 2004/05/02 20:47:24 dhartmei Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.7 2004/05/31 22:48:19 mlaier Exp $	*/
 /*	$OpenBSD: pf_ioctl.c,v 1.81.2.2 2004/04/30 23:28:58 brad Exp $ */
 
 /*
@@ -51,6 +51,7 @@
 #include <sys/time.h>
 #include <sys/malloc.h>
 #ifdef __FreeBSD__
+#include <sys/module.h>
 #include <sys/conf.h>
 #else
 #include <sys/timeout.h>