From owner-svn-src-head@FreeBSD.ORG  Tue Jun  9 20:27:30 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E98B8106567C;
	Tue,  9 Jun 2009 20:27:30 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D877D8FC19;
	Tue,  9 Jun 2009 20:27:30 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59KRUd2082872;
	Tue, 9 Jun 2009 20:27:30 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59KRUvF082868;
	Tue, 9 Jun 2009 20:27:30 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906092027.n59KRUvF082868@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 9 Jun 2009 20:27:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193856 - in head/sys: conf net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 20:27:31 -0000

Author: kmacy
Date: Tue Jun  9 20:27:30 2009
New Revision: 193856
URL: http://svn.freebsd.org/changeset/base/193856

Log:
  make flowtable opt-out

Modified:
  head/sys/conf/files
  head/sys/conf/options
  head/sys/net/flowtable.c
  head/sys/net/flowtable.h

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Jun  9 20:26:52 2009	(r193855)
+++ head/sys/conf/files	Tue Jun  9 20:27:30 2009	(r193856)
@@ -2180,7 +2180,7 @@ net/bpf_jitter.c		optional bpf_jitter
 net/bpf_filter.c		optional bpf | netgraph_bpf
 net/bpf_zerocopy.c		optional bpf
 net/bridgestp.c			optional bridge | if_bridge
-net/flowtable.c			optional flowtable inet
+net/flowtable.c			optional inet
 net/ieee8023ad_lacp.c		optional lagg
 net/if.c			standard
 net/if_arcsubr.c		optional arcnet

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Tue Jun  9 20:26:52 2009	(r193855)
+++ head/sys/conf/options	Tue Jun  9 20:27:30 2009	(r193856)
@@ -421,7 +421,7 @@ TCP_OFFLOAD_DISABLE	opt_inet.h #Disable 
 TCP_SIGNATURE		opt_inet.h
 VLAN_ARRAY		opt_vlan.h
 XBONEHACK
-FLOWTABLE		opt_route.h
+NO_FLOWTABLE		opt_route.h
 
 #
 # SCTP

Modified: head/sys/net/flowtable.c
==============================================================================
--- head/sys/net/flowtable.c	Tue Jun  9 20:26:52 2009	(r193855)
+++ head/sys/net/flowtable.c	Tue Jun  9 20:27:30 2009	(r193856)
@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifndef NO_FLOWTABLE
 #include <sys/param.h>  
 #include <sys/types.h>
 #include <sys/bitstring.h>
@@ -929,4 +930,4 @@ static struct kproc_desc flow_kp = {
 	&flowcleanerproc
 };
 SYSINIT(flowcleaner, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &flow_kp);
-
+#endif /* NO_FLOWTABLE */

Modified: head/sys/net/flowtable.h
==============================================================================
--- head/sys/net/flowtable.h	Tue Jun  9 20:26:52 2009	(r193855)
+++ head/sys/net/flowtable.h	Tue Jun  9 20:27:30 2009	(r193856)
@@ -41,7 +41,7 @@ struct flowtable;
 extern struct flowtable *ip_ft;
 extern struct flowtable *ip_forward_ft;
 
-#ifdef FLOWTABLE
+#ifndef NO_FLOWTABLE
 struct flowtable *flowtable_alloc(int nentry, int flags);
 
 /*