Skip to content

Commit

Permalink
netns: add stub functions for per/namespace mibs allocation
Browse files Browse the repository at this point in the history
The content of init_ipv6_mibs/cleanup_ipv6_mibs will be moved to new
calls one by one next.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Oct 7, 2008
1 parent ab38dc7 commit e43291c
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions net/ipv6/af_inet6.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,13 +835,25 @@ static void cleanup_ipv6_mibs(void)
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)
{
int err = 0;

net->ipv6.sysctl.bindv6only = 0;
net->ipv6.sysctl.icmpv6_time = 1*HZ;

err = ipv6_init_mibs(net);
if (err)
return err;
#ifdef CONFIG_PROC_FS
err = udp6_proc_init(net);
if (err)
Expand All @@ -852,7 +864,6 @@ static int inet6_net_init(struct net *net)
err = ac6_proc_init(net);
if (err)
goto proc_ac6_fail;
out:
#endif
return err;

Expand All @@ -861,7 +872,9 @@ static int inet6_net_init(struct net *net)
tcp6_proc_exit(net);
proc_tcp6_fail:
udp6_proc_exit(net);
goto out;
out:
ipv6_cleanup_mibs(net);
return err;
#endif
}

Expand All @@ -872,6 +885,7 @@ static void inet6_net_exit(struct net *net)
tcp6_proc_exit(net);
ac6_proc_exit(net);
#endif
ipv6_cleanup_mibs(net);
}

static struct pernet_operations inet6_net_ops = {
Expand Down

0 comments on commit e43291c

Please sign in to comment.