svn commit: r208171 - in head/sys: net netinet6

[Kip Macy]

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;