svn commit: r259957 - projects/diffused_head/sys/netpfil/ipfw

[Ed Maste]

Author: emaste
Date: Fri Dec 27 17:58:13 2013
New Revision: 259957
URL: http://svnweb.freebsd.org/changeset/base/259957

Log:
  Add required headers after merge from HEAD
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_c45.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_nbayes.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_export.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iat.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iatbd.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_pcnt.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plen.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plenbd.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_skype.c
  projects/diffused_head/sys/netpfil/ipfw/diffuse_flowtable.c
  projects/diffused_head/sys/netpfil/ipfw/ip_diffuse.c

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_c45.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_c45.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_c45.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -40,9 +40,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_nbayes.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_nbayes.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_classifier_nbayes.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -40,8 +40,10 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/mbuf.h>
+#include <sys/rwlock.h>
 #else
 #include <sys/types.h>
 #include <stdio.h>

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_export.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_export.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_export.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netinet/in.h>

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iat.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iat.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iat.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -40,9 +40,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iatbd.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iatbd.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_iatbd.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -36,9 +36,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_pcnt.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_pcnt.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_pcnt.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -40,9 +40,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plen.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plen.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plen.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -40,9 +40,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plenbd.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plenbd.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_plenbd.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -36,9 +36,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_skype.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_skype.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_feature_skype.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -38,9 +38,11 @@ __FBSDID("$FreeBSD$");
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/diffuse_flowtable.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/diffuse_flowtable.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/diffuse_flowtable.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -49,7 +49,11 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/sysctl.h>
+#include <sys/rwlock.h>
 #endif /* _KERNEL */
 #include <sys/socket.h>
 

Modified: projects/diffused_head/sys/netpfil/ipfw/ip_diffuse.c
==============================================================================
--- projects/diffused_head/sys/netpfil/ipfw/ip_diffuse.c	Fri Dec 27 17:47:45 2013	(r259956)
+++ projects/diffused_head/sys/netpfil/ipfw/ip_diffuse.c	Fri Dec 27 17:58:13 2013	(r259957)
@@ -42,11 +42,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
+#include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>