diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-22 09:06:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:10:35 -0500 |
commit | e5a2bb842cd9681d00d4ca963e63e4d3647e66f8 (patch) | |
tree | b47692f3312039cb944f68f6fbeb0d10442f8056 /net/ipv6/reassembly.c | |
parent | ac18e7509e7df327e30d6e073a787d922eaf211d (diff) |
[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 'net/ipv6/reassembly.c')
-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 | |||
84 | 84 | ||
85 | static struct inet_frags ip6_frags; | 85 | static struct inet_frags ip6_frags; |
86 | 86 | ||
87 | int ip6_frag_nqueues(void) | 87 | int ip6_frag_nqueues(struct net *net) |
88 | { | 88 | { |
89 | return ip6_frags.nqueues; | 89 | return net->ipv6.frags.nqueues; |
90 | } | 90 | } |
91 | 91 | ||
92 | int ip6_frag_mem(void) | 92 | int ip6_frag_mem(void) |
@@ -690,6 +690,8 @@ static int ipv6_frags_init_net(struct net *net) | |||
690 | net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT; | 690 | net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT; |
691 | net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ; | 691 | net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ; |
692 | 692 | ||
693 | inet_frags_init_net(&net->ipv6.frags); | ||
694 | |||
693 | return ip6_frags_sysctl_register(net); | 695 | return ip6_frags_sysctl_register(net); |
694 | } | 696 | } |
695 | 697 | ||