From owner-svn-src-projects@FreeBSD.ORG  Fri Dec 27 17:58:16 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 06B8CB40;
 Fri, 27 Dec 2013 17:58:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB012129F;
 Fri, 27 Dec 2013 17:58:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRHwFZQ047814;
 Fri, 27 Dec 2013 17:58:15 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRHwDqV047798;
 Fri, 27 Dec 2013 17:58:13 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201312271758.rBRHwDqV047798@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 27 Dec 2013 17:58:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r259957 - projects/diffused_head/sys/netpfil/ipfw
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 17:58:16 -0000

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>