diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-22 15:06:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:10:35 +0100 |
| commit | e5a2bb842cd9681d00d4ca963e63e4d3647e66f8 (patch) | |
| tree | b47692f3312039cb944f68f6fbeb0d10442f8056 /net/ipv6/reassembly.c | |
| parent | [NETNS][FRAGS]: Make the inet_frag_queue lookup work in namespaces. (diff) | |
| download | linux-e5a2bb842cd9681d00d4ca963e63e4d3647e66f8.tar.xz linux-e5a2bb842cd9681d00d4ca963e63e4d3647e66f8.zip | |
[NETNS][FRAGS]: Make the nqueues counter per-namespace.
This is simple - just move the variable from struct inet_frags
to struct netns_frags and adjust the usage appropriately.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/reassembly.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index ab2d53b81b70..77a874020f3a 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -84,9 +84,9 @@ struct frag_queue static struct inet_frags ip6_frags; -int ip6_frag_nqueues(void) +int ip6_frag_nqueues(struct net *net) { - return ip6_frags.nqueues; + return net->ipv6.frags.nqueues; } int ip6_frag_mem(void) @@ -690,6 +690,8 @@ static int ipv6_frags_init_net(struct net *net) net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT; net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ; + inet_frags_init_net(&net->ipv6.frags); + return ip6_frags_sysctl_register(net); } |