From 83e711ec1441b2a96bbf97ec32f181b88ae40f26 Mon Sep 17 00:00:00 2001
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 16 May 2010 21:48:39 +0000
Subject: [PATCH] allocate ipv6 flows from the ipv6 flow zone

reported by: rrs@

MFC after:	3 days
---
 sys/net/flowtable.c      | 1 -
 sys/net/flowtable.h      | 1 +
 sys/netinet6/ip6_input.c | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c
index 514c17a95c8..b1fd15ff0c5 100644
--- a/sys/net/flowtable.c
+++ b/sys/net/flowtable.c
@@ -417,7 +417,6 @@ flowtable_pcpu_unlock(struct flowtable *table, uint32_t hash)
 #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
diff --git a/sys/net/flowtable.h b/sys/net/flowtable.h
index 6e79a3cfe93..d810fa33b59 100644
--- a/sys/net/flowtable.h
+++ b/sys/net/flowtable.h
@@ -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)
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index e3cf2eb34b1..9e7573afd7b 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -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;