diff options
| author | kmacy <kmacy@FreeBSD.org> | 2010-05-16 21:48:39 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2010-05-16 21:48:39 +0000 |
| commit | a68dd336d5b121f161468847e1c9ebb7eb8b3d4f (patch) | |
| tree | de9abf4e453c89ff5c9e213b405033a1efd2a507 | |
| parent | b447cf7e7fe64bed9520500b0b555c13f09a87b3 (diff) | |
| download | FreeBSD-src-a68dd336d5b121f161468847e1c9ebb7eb8b3d4f.zip FreeBSD-src-a68dd336d5b121f161468847e1c9ebb7eb8b3d4f.tar.gz | |
allocate ipv6 flows from the ipv6 flow zone
reported by: rrs@
MFC after: 3 days
| -rw-r--r-- | sys/net/flowtable.c | 1 | ||||
| -rw-r--r-- | sys/net/flowtable.h | 1 | ||||
| -rw-r--r-- | 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 514c17a..b1fd15f 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 6e79a3c..d810fa3 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 e3cf2eb..9e7573a 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; |
