From owner-svn-src-all@FreeBSD.ORG  Sun May 16 21:48:40 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 55DC3106567C;
	Sun, 16 May 2010 21:48:40 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44C118FC16;
	Sun, 16 May 2010 21:48:40 +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 o4GLme5O025006;
	Sun, 16 May 2010 21:48:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4GLmele025002;
	Sun, 16 May 2010 21:48:40 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201005162148.o4GLmele025002@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 16 May 2010 21:48:40 +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: r208171 - in head/sys: net netinet6
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 May 2010 21:48:40 -0000

Author: kmacy
Date: Sun May 16 21:48:39 2010
New Revision: 208171
URL: http://svn.freebsd.org/changeset/base/208171

Log:
  allocate ipv6 flows from the ipv6 flow zone
  
  reported by: rrs@
  
  MFC after:	3 days

Modified:
  head/sys/net/flowtable.c
  head/sys/net/flowtable.h
  head/sys/netinet6/ip6_input.c

Modified: head/sys/net/flowtable.c
==============================================================================
--- head/sys/net/flowtable.c	Sun May 16 21:06:26 2010	(r208170)
+++ head/sys/net/flowtable.c	Sun May 16 21:48:39 2010	(r208171)
@@ -417,7 +417,6 @@ flowtable_pcpu_unlock(struct flowtable *
 #define FL_ENTRY_UNLOCK(table, hash) (table)->ft_unlock((table), (hash))
 
 #define FL_STALE 	(1<<8)
-#define FL_IPV6  	(1<<9)
 #define FL_OVERWRITE	(1<<10)
 
 void

Modified: head/sys/net/flowtable.h
==============================================================================
--- head/sys/net/flowtable.h	Sun May 16 21:06:26 2010	(r208170)
+++ head/sys/net/flowtable.h	Sun May 16 21:48:39 2010	(r208171)
@@ -37,6 +37,7 @@ $FreeBSD$
 #define	FL_HASH_ALL	(1<<0)	/* hash 4-tuple + protocol */
 #define	FL_PCPU		(1<<1)	/* pcpu cache */
 #define	FL_NOAUTO	(1<<2)	/* don't automatically add flentry on miss */
+#define FL_IPV6  	(1<<9)
 
 #define	FL_TCP		(1<<11)
 #define	FL_SCTP		(1<<12)

Modified: head/sys/netinet6/ip6_input.c
==============================================================================
--- head/sys/netinet6/ip6_input.c	Sun May 16 21:06:26 2010	(r208170)
+++ head/sys/netinet6/ip6_input.c	Sun May 16 21:48:39 2010	(r208171)
@@ -191,7 +191,7 @@ ip6_init(void)
 		 */
 		V_ip6_output_flowtable_size = 1 << fls((1024 + maxusers * 64)-1);
 	}
-	V_ip6_ft = flowtable_alloc("ipv6", V_ip6_output_flowtable_size, FL_PCPU);
+	V_ip6_ft = flowtable_alloc("ipv6", V_ip6_output_flowtable_size, FL_IPV6|FL_PCPU);
 #endif	
 	
 	V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR;