svn commit: r193856 - in head/sys: conf net

[M. Warner Losh]

In message: <200906092027.n59KRUvF082868 at svn.freebsd.org>
            Kip Macy <kmacy at FreeBSD.org> 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 <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);
:  
:  /*
: