From owner-svn-src-user@FreeBSD.ORG  Fri Nov 14 02:11:12 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F40161065680;
	Fri, 14 Nov 2008 02:11:11 +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 DB9C68FC12;
	Fri, 14 Nov 2008 02:11:11 +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 mAE2BB5u075692;
	Fri, 14 Nov 2008 02:11:11 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAE2BBg0075691;
	Fri, 14 Nov 2008 02:11:11 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811140211.mAE2BBg0075691@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 14 Nov 2008 02:11:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184951 - user/kmacy/HEAD_fast_multi_xmit/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2008 02:11:12 -0000

Author: kmacy
Date: Fri Nov 14 02:11:11 2008
New Revision: 184951
URL: http://svn.freebsd.org/changeset/base/184951

Log:
  reverse sense of flowtable toggle sysctl

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c	Fri Nov 14 01:56:11 2008	(r184950)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c	Fri Nov 14 02:11:11 2008	(r184951)
@@ -291,9 +291,9 @@ static uint32_t hashjitter;
 
 SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable");
 
-static int	flowtable_disable;
-SYSCTL_INT(_net_inet_flowtable, OID_AUTO, disable, CTLFLAG_RW,
-    &flowtable_disable, 0, "disable flowtable.");
+static int	flowtable_enable = 1;
+SYSCTL_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW,
+    &flowtable_enable, 0, "enable flowtable caching.");
 
 
 #ifndef RADIX_MPATH
@@ -366,7 +366,7 @@ ipv4_flow_lookup_hash_internal(struct mb
 	sin->sin_len = sizeof(*sin);
 	sin->sin_addr = ip->ip_dst;
 
-	if (flowtable_disable)
+	if (flowtable_enable == 0)
 		return (0);
 	
 	switch (proto) {
@@ -438,11 +438,6 @@ flowtable_entry(struct flowtable *ft, ui
 	
 	if ((ft->ft_flags & FL_IPV6) == 0) {
 		if (ft->ft_flags & FL_PCPU) {
-			if (curthread->td_critnest == 0) {
-				panic("not protected by critical section in lookup");
-			}
-			
-			
 			fle = (struct flentry *)
 			    &ft->ft_table.v4_pcpu[curcpu][index];
 		} else