提交 e43291cb 编写于 作者: D Denis V. Lunev 提交者: David S. Miller

netns: add stub functions for per/namespace mibs allocation

The content of init_ipv6_mibs/cleanup_ipv6_mibs will be moved to new
calls one by one next.
Signed-off-by: NDenis V. Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ab38dc7a
...@@ -835,6 +835,15 @@ static void cleanup_ipv6_mibs(void) ...@@ -835,6 +835,15 @@ static void cleanup_ipv6_mibs(void)
snmp_mib_free((void **)udplite_stats_in6); snmp_mib_free((void **)udplite_stats_in6);
} }
static int __net_init ipv6_init_mibs(struct net *net)
{
return 0;
}
static void __net_exit ipv6_cleanup_mibs(struct net *net)
{
}
static int inet6_net_init(struct net *net) static int inet6_net_init(struct net *net)
{ {
int err = 0; int err = 0;
...@@ -842,6 +851,9 @@ static int inet6_net_init(struct net *net) ...@@ -842,6 +851,9 @@ static int inet6_net_init(struct net *net)
net->ipv6.sysctl.bindv6only = 0; net->ipv6.sysctl.bindv6only = 0;
net->ipv6.sysctl.icmpv6_time = 1*HZ; net->ipv6.sysctl.icmpv6_time = 1*HZ;
err = ipv6_init_mibs(net);
if (err)
return err;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
err = udp6_proc_init(net); err = udp6_proc_init(net);
if (err) if (err)
...@@ -852,7 +864,6 @@ static int inet6_net_init(struct net *net) ...@@ -852,7 +864,6 @@ static int inet6_net_init(struct net *net)
err = ac6_proc_init(net); err = ac6_proc_init(net);
if (err) if (err)
goto proc_ac6_fail; goto proc_ac6_fail;
out:
#endif #endif
return err; return err;
...@@ -861,7 +872,9 @@ static int inet6_net_init(struct net *net) ...@@ -861,7 +872,9 @@ static int inet6_net_init(struct net *net)
tcp6_proc_exit(net); tcp6_proc_exit(net);
proc_tcp6_fail: proc_tcp6_fail:
udp6_proc_exit(net); udp6_proc_exit(net);
goto out; out:
ipv6_cleanup_mibs(net);
return err;
#endif #endif
} }
...@@ -872,6 +885,7 @@ static void inet6_net_exit(struct net *net) ...@@ -872,6 +885,7 @@ static void inet6_net_exit(struct net *net)
tcp6_proc_exit(net); tcp6_proc_exit(net);
ac6_proc_exit(net); ac6_proc_exit(net);
#endif #endif
ipv6_cleanup_mibs(net);
} }
static struct pernet_operations inet6_net_ops = { static struct pernet_operations inet6_net_ops = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册