mib: put tcp statistics on struct net

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / af_inet.c

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index b4b77aa079536e50ba68bda6c3c0b9026868448c..c1a3e986f8b499e1612dd534b70d5c5ff9c05c0b 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1342,11 +1342,20 @@ static struct net_protocol icmp_protocol = {
 
 static __net_init int ipv4_mib_init_net(struct net *net)
 {
+       if (snmp_mib_init((void **)net->mib.tcp_statistics,
+                         sizeof(struct tcp_mib)) < 0)
+               goto err_tcp_mib;
+
+       tcp_mib_init(net);
        return 0;
+
+err_tcp_mib:
+       return -ENOMEM;
 }
 
 static __net_exit void ipv4_mib_exit_net(struct net *net)
 {
+       snmp_mib_free((void **)net->mib.tcp_statistics);
 }
 
 static __net_initdata struct pernet_operations ipv4_mib_ops = {
@@ -1368,9 +1377,6 @@ static int __init init_ipv4_mibs(void)
        if (snmp_mib_init((void **)icmpmsg_statistics,
                          sizeof(struct icmpmsg_mib)) < 0)
                goto err_icmpmsg_mib;
-       if (snmp_mib_init((void **)tcp_statistics,
-                         sizeof(struct tcp_mib)) < 0)
-               goto err_tcp_mib;
        if (snmp_mib_init((void **)udp_statistics,
                          sizeof(struct udp_mib)) < 0)
                goto err_udp_mib;
@@ -1378,8 +1384,6 @@ static int __init init_ipv4_mibs(void)
                          sizeof(struct udp_mib)) < 0)
                goto err_udplite_mib;
 
-       tcp_mib_init(&init_net);
-
        if (register_pernet_subsys(&ipv4_mib_ops))
                goto err_net;
 
@@ -1390,8 +1394,6 @@ err_net:
 err_udplite_mib:
        snmp_mib_free((void **)udp_statistics);
 err_udp_mib:
-       snmp_mib_free((void **)tcp_statistics);
-err_tcp_mib:
        snmp_mib_free((void **)icmpmsg_statistics);
 err_icmpmsg_mib:
        snmp_mib_free((void **)icmp_statistics);