@@ -1629,7 +1629,33 @@ err_tcp_mib:
return -ENOMEM;
}
-static __net_exit void ipv4_mib_exit_net(struct net *net)
+static __net_init int inet4_net_init(struct net *net)
+{
+ struct netns_ipv4 *nip4 = &net->ipv4;
+ int rc;
+
+ rc = ipv4_mib_init_net(net);
+ if (rc < 0)
+ return rc;
+
+ /*
+ * Sane defaults - nobody may create ping sockets.
+ * Boot scripts should set this to distro-specific group.
+ */
+ nip4->sysctl_ping_group_range[0] = make_kgid(&init_user_ns, 1);
+ nip4->sysctl_ping_group_range[1] = make_kgid(&init_user_ns, 0);
+
+ /*
+ * Set defaults for local port range
+ */
+ seqlock_init(&nip4->sysctl_local_ports.lock);
+ nip4->sysctl_local_ports.range[0] = 32768;
+ nip4->sysctl_local_ports.range[1] = 61000;
+
+ return rc;
+}
+
+static __net_exit void inet4_net_exit(struct net *net)
{
kfree(net->mib.icmpmsg_statistics);
snmp_mib_free((void __percpu **)net->mib.icmp_statistics);
@@ -1640,14 +1666,14 @@ static __net_exit void ipv4_mib_exit_net(struct net *net)
snmp_mib_free((void __percpu **)net->mib.tcp_statistics);
}
-static __net_initdata struct pernet_operations ipv4_mib_ops = {
- .init = ipv4_mib_init_net,
- .exit = ipv4_mib_exit_net,
+static __net_initdata struct pernet_operations inet4_net_ops = {
+ .init = inet4_net_init,
+ .exit = inet4_net_exit,
};
static int __init init_ipv4_mibs(void)
{
- return register_pernet_subsys(&ipv4_mib_ops);
+ return register_pernet_subsys(&inet4_net_ops);
}
static int ipv4_proc_init(void);
@@ -858,20 +858,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
table[i].data += (void *)net - (void *)&init_net;
}
- /*
- * Sane defaults - nobody may create ping sockets.
- * Boot scripts should set this to distro-specific group.
- */
- net->ipv4.sysctl_ping_group_range[0] = make_kgid(&init_user_ns, 1);
- net->ipv4.sysctl_ping_group_range[1] = make_kgid(&init_user_ns, 0);
-
- /*
- * Set defaults for local port range
- */
- seqlock_init(&net->ipv4.sysctl_local_ports.lock);
- net->ipv4.sysctl_local_ports.range[0] = 32768;
- net->ipv4.sysctl_local_ports.range[1] = 61000;
-
net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
if (net->ipv4.ipv4_hdr == NULL)
goto err_reg;