PERFORCE change 53912 for review

[Robert Watson]

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

Change 53912 by rwatson at 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 at 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>