From owner-svn-src-all@FreeBSD.ORG Tue Jun 9 21:55:29 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 5DDE61065674; Tue, 9 Jun 2009 21:55:29 +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 322E68FC13; Tue, 9 Jun 2009 21:55:29 +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 n59LtTiL085084; Tue, 9 Jun 2009 21:55:29 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59LtS7f085080; Tue, 9 Jun 2009 21:55:28 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906092155.n59LtS7f085080@svn.freebsd.org> From: Kip Macy Date: Tue, 9 Jun 2009 21:55:28 +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: r193863 - 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:55:29 -0000 Author: kmacy Date: Tue Jun 9 21:55:28 2009 New Revision: 193863 URL: http://svn.freebsd.org/changeset/base/193863 Log: revert to opt-in flowtable 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 21:43:04 2009 (r193862) +++ head/sys/conf/files Tue Jun 9 21:55:28 2009 (r193863) @@ -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 inet +net/flowtable.c optional flowtable 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 21:43:04 2009 (r193862) +++ head/sys/conf/options Tue Jun 9 21:55:28 2009 (r193863) @@ -421,7 +421,7 @@ TCP_OFFLOAD_DISABLE opt_inet.h #Disable TCP_SIGNATURE opt_inet.h VLAN_ARRAY opt_vlan.h XBONEHACK -NO_FLOWTABLE opt_route.h +FLOWTABLE opt_route.h # # SCTP Modified: head/sys/net/flowtable.c ============================================================================== --- head/sys/net/flowtable.c Tue Jun 9 21:43:04 2009 (r193862) +++ head/sys/net/flowtable.c Tue Jun 9 21:55:28 2009 (r193863) @@ -33,7 +33,6 @@ POSSIBILITY OF SUCH DAMAGE. #include __FBSDID("$FreeBSD$"); -#ifndef NO_FLOWTABLE #include #include #include @@ -188,7 +187,7 @@ static uma_zone_t ipv6_zone; * - support explicit connection state (currently only ad-hoc for DSR) */ SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable"); -int flowtable_enable = 0; +int flowtable_enable = 1; SYSCTL_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW, &flowtable_enable, 0, "enable flowtable caching."); static int flowtable_hits = 0; @@ -930,4 +929,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 21:43:04 2009 (r193862) +++ head/sys/net/flowtable.h Tue Jun 9 21:55:28 2009 (r193863) @@ -41,7 +41,7 @@ struct flowtable; extern struct flowtable *ip_ft; extern struct flowtable *ip_forward_ft; -#ifndef NO_FLOWTABLE +#ifdef FLOWTABLE struct flowtable *flowtable_alloc(int nentry, int flags); /*