From owner-svn-src-user@FreeBSD.ORG  Sat Feb  6 23:30:10 2010
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 4226A106568B;
	Sat,  6 Feb 2010 23:30:10 +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 329FD8FC14;
	Sat,  6 Feb 2010 23:30:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o16NUAjt071033;
	Sat, 6 Feb 2010 23:30:10 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o16NUAOQ071031;
	Sat, 6 Feb 2010 23:30:10 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201002062330.o16NUAOQ071031@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 6 Feb 2010 23:30:10 +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: r203579 - user/kmacy/head_flowtable_v6/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: Sat, 06 Feb 2010 23:30:10 -0000

Author: kmacy
Date: Sat Feb  6 23:30:09 2010
New Revision: 203579
URL: http://svn.freebsd.org/changeset/base/203579

Log:
  don't add entry on miss if FL_NOAUTO is set

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

Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c
==============================================================================
--- user/kmacy/head_flowtable_v6/sys/net/flowtable.c	Sat Feb  6 23:21:05 2010	(r203578)
+++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c	Sat Feb  6 23:30:09 2010	(r203579)
@@ -1073,9 +1073,10 @@ keycheck:	
 		goto keycheck;
 	}
 	FL_ENTRY_UNLOCK(ft, hash);
+uncached:
 	if (flags & FL_NOAUTO)
 		return (NULL);
-uncached:
+
 	V_flowtable_misses++;
 	/*
 	 * This bit of code ends up locking the