From owner-svn-src-all@FreeBSD.ORG Tue Jun 9 21:41:43 2009 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FA5A106566B; Tue, 9 Jun 2009 21:41:43 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id EECFF8FC14; Tue, 9 Jun 2009 21:41:42 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id n59Lbla9051211; Tue, 9 Jun 2009 15:37:47 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Tue, 09 Jun 2009 15:38:05 -0600 (MDT) Message-Id: <20090609.153805.-862244084.imp@bsdimp.com> To: kmacy@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200906092027.n59KRUvF082868@svn.freebsd.org> References: <200906092027.n59KRUvF082868@svn.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r193856 - in head/sys: conf net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 21:41:43 -0000 In message: <200906092027.n59KRUvF082868@svn.freebsd.org> Kip Macy writes: : 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 Per my earlier email, please back this out. It is lame for the reasons I explained there, and has no general consensus for this change. Warner : 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 : __FBSDID("$FreeBSD$"); : : +#ifndef NO_FLOWTABLE : #include : #include : #include : @@ -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); : : /* :